[Monotone-devel] Can Monotone not diff across file renames?

[Jack Lloyd]

I am seriously confused by the behavior I am seeing. I thought this worked?

I am in a net.randombit.botan workspace, in src/math/bigint/mp_ia32_msvc.
In that directory, I run:

$ mtn log mp_asm.h

I get this (I'm including the entire history of the file because it is not
too long):

o     (Revision: 817f1956943c877dcc5aad97774ccd81804654fc)
|\
o |   -----------------------------------------------------------------
| |   Revision: 141433027ee455b8c8b2829f5233eb577039bd41
| |   Ancestor: 8a7dd28c69f965e853e95156a43db6d09be7d997
| |   Author: address@hidden
| |   Date: 2008-10-15T00:47:14
| |   Branch: net.randombit.botan
| |
| |   Modified files:
| |           src/math/bigint/mp_ia32_msvc/mp_asmi.h
| |
| |   ChangeLog:
| |
| |   Clean up VC++ ia32 asm a bit, use new defs of word3_muladd* from generic 
mp_asmi.h
o |   -----------------------------------------------------------------
| |   Revision: 8a7dd28c69f965e853e95156a43db6d09be7d997
| |   Ancestor: 5d9b383350487fe81dd6196b9ffab20e51a7b094
| |   Author: address@hidden
| |   Date: 2008-10-15T00:43:07
| |   Branch: net.randombit.botan
| |
| |   Modified files:
| |           checks/check.cpp src/build-data/botan.doxy.in
| |           src/math/bigint/mp_ia32_msvc/mp_asmi.h
| |
| |   ChangeLog:
| |
| |   Fix include of mp_asm.h in mp_ia32_msvc/mp_asmi.h (used quotes instead of 
brackets)
o |   (Revision: 5d9b383350487fe81dd6196b9ffab20e51a7b094)
|\|
o |   -----------------------------------------------------------------
| |   Revision: 511f71afad242186e9339d37f73036c239004281
| |   Ancestor: 50e967691e675c407a12b14cdc24b0deb9c9f8a8
| |   Author: address@hidden
| |   Date: 2008-09-17T22:38:10
| |   Branch: net.randombit.botan
| |
| |   Modified files:
| |           modules/mp_ia32_msvc/mp_asmi.h
| |
| |   ChangeLog:
| |
| |   Update to 8 word linmul2. Fix word8_madd3
o |   (Revision: 50e967691e675c407a12b14cdc24b0deb9c9f8a8)
|\|
o |   -----------------------------------------------------------------
| |   Revision: 9e4dfdb079d2f320063d19f75de3fd355d28b613
| |   Ancestor: ff7c836f6b49741e71026fff9595774f92d9950f
| |   Author: address@hidden
| |   Date: 2008-09-17T22:04:40
| |   Branch: net.randombit.botan
| |
| |   Modified files:
| |           modules/mp_ia32_msvc/mp_asmi.h
| |
| |   ChangeLog:
| |
| |   Add yet another version of the Visual C++ x86 asm by Luca Piccarreta,
| |   this version adding an SSE2 implementation of word8_linmul3 (though Luca
| |   added a comment noting that it was slower than the plain x86 version).
| |
| |   I'm not intentionally checking these versions in order, this just happened
| |   to be the order I found them in!
| |
| |   This version was dated 2006-01-23
o |   -----------------------------------------------------------------
| |   Revision: ff7c836f6b49741e71026fff9595774f92d9950f
| |   Ancestor: 7fc2dfd566b6c68c479bca037bedec3fbdfc731d
| |   Author: address@hidden
| |   Date: 2008-09-17T21:57:07
| |   Branch: net.randombit.botan
| |
| |   Modified files:
| |           modules/mp_ia32_msvc/mp_asmi.h
| |
| |   ChangeLog:
| |
| |   Update the Visual C++ assembler with another version also by Luca 
Piccarreta
| |   which uses 8 word blocks. This version was dated 2006-01-22
o |   -----------------------------------------------------------------
|/    Revision: 7fc2dfd566b6c68c479bca037bedec3fbdfc731d
|     Ancestor: ff2148e42baf841d99b68017be88dffdede3f07d
|     Author: address@hidden
|     Date: 2008-09-17T21:49:24
|     Branch: net.randombit.botan
|
|     Modified files:
|             modules/mp_ia32_msvc/mp_asmi.h
|
|     ChangeLog:
|
|     Reindent
o   -----------------------------------------------------------------
|   Revision: ff2148e42baf841d99b68017be88dffdede3f07d
|   Ancestor: b077aedf04b1001eb385c7c5793bea80fab0c90c
|   Author: address@hidden
|   Date: 2008-09-17T21:43:36
|   Branch: net.randombit.botan
|
|   Added files:
|           modules/mp_ia32_msvc/modinfo.txt
|           modules/mp_ia32_msvc/mp_asmi.h
|   Added directories:
|           modules/mp_ia32_msvc
|
|   ChangeLog:
|
|   Add some inline assembler for x86 systems using Visual Studio's
|   inline asm syntax. This code was written and submitted by
|   Luca Piccarreta in 2006. Sometimes it takes a while for me to work
|   through patches.
|
|   It does not implement the right functions (using 4 word blocks instead of
|   8), so it will not work and of course also has not been tested at all.
o   (Revision: b077aedf04b1001eb385c7c5793bea80fab0c90c)



So, I want to see what changed since 511f71afad242186e9339d37f73036c239004281, 
but:


$ mtn diff -r 511f71afad242186e9339d37f73036c239004281 mp_asmi.h 
mtn: misuse: file modules/mp_ia32_msvc/mp_asmi.h does not exist
#
# old_revision [511f71afad242186e9339d37f73036c239004281]
#
# patch "modules/mp_ia32_msvc/mp_asmi.h"
#  from [a51f4b885bdf2d6844bc5c822a8f0c1d62c90365]
#    to [b3fa41862df8266419d9b7c1b88909588f53a6bf]
#
============================================================


$ mtn cat -r 511f71afad242186e9339d37f73036c239004281 mp_asmi.h 
mtn: misuse: no file 'src/math/bigint/mp_ia32_msvc/mp_asmi.h' found in revision 
'511f71afad242186e9339d37f73036c239004281'


$ mtn cat -r 511f71afad242186e9339d37f73036c239004281 
modules/mp_ia32_msvc/mp_asmi.h
mtn: misuse: no file 
'src/math/bigint/mp_ia32_msvc/modules/mp_ia32_msvc/mp_asmi.h' found in revision 
'511f71afad242186e9339d37f73036c239004281'

$ mtn cat -r 511f71afad242186e9339d37f73036c239004281 
../../../../modules/mp_ia32_msvc/mp_asmi.h
<output of file>

$ mtn cat -r 511f71afad242186e9339d37f73036c239004281 
/modules/mp_ia32_msvc/mp_asmi.h
mtn: misuse: absolute path '/modules/mp_ia32_msvc/mp_asmi.h' is invalid

I don't understand why Monotone doesn't know to follow the rename to
the old location of the contents. Is this harder than it looks? (I
thought this worked)

At the least it would be nice if one could refer to the project root
using / to avoid the ../../../../ that is required here. (Would
pivot_root break that?)

$ mtn version --full
monotone 0.41 (base revision: 9b264ec9247ce99cd1fdc5293e869c1a60b01c4c)
Running on          : Linux 2.6.24.7 #1 SMP Tue Jun 24 10:34:47 EDT 2008 x86_64
C++ compiler        : GNU C++ version 4.3.1
C++ standard library: GNU libstdc++ version 20080606
Boost version       : 1_35
Changes since base revision:
unknown

-Jack