fix traceback of extdiff after a merge

- files that comes from a different branch are marked as modified
  but aren't present in the original manifest
- add a testcase for extdiff and for regular diff

hgext/extdiff.py

@@ -1,184 +1,187
 # extdiff.py - external diff program support for mercurial
 #
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 #
 # The `extdiff' Mercurial extension allows you to use external programs
 # to compare revisions, or revision with working dir.  The external diff
 # programs are called with a configurable set of options and two
 # non-option arguments: paths to directories containing snapshots of
 # files to compare.
 #
 # To enable this extension:
 #
 #   [extensions]
 #   hgext.extdiff =
 #
 # The `extdiff' extension also allows to configure new diff commands, so
 # you do not need to type "hg extdiff -p kdiff3" always.
 #
 #   [extdiff]
 #   # add new command that runs GNU diff(1) in 'context diff' mode
 #   cmd.cdiff = gdiff
 #   opts.cdiff = -Nprc5
 
 #   # add new command called vdiff, runs kdiff3
 #   cmd.vdiff = kdiff3
 
 #   # add new command called meld, runs meld (no need to name twice)
 #   cmd.meld =
 
 #   # add new command called vimdiff, runs gvimdiff with DirDiff plugin
 #   #(see http://www.vim.org/scripts/script.php?script_id=102)
 #   # Non english user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
 #   # your .vimrc
 #   cmd.vimdiff = gvim
 #   opts.vimdiff = -f '+next' '+execute "DirDiff" argv(0) argv(1)'
 #
 # Each custom diff commands can have two parts: a `cmd' and an `opts'
 # part.  The cmd.xxx option defines the name of an executable program
 # that will be run, and opts.xxx defines a set of command-line options
 # which will be inserted to the command between the program name and
 # the files/directories to diff (i.e. the cdiff example above).
 #
 # You can use -I/-X and list of file or directory names like normal
 # "hg diff" command.  The `extdiff' extension makes snapshots of only
 # needed files, so running the external diff program will actually be
 # pretty fast (at least faster than having to compare the entire tree).
 
 from mercurial.demandload import demandload
 from mercurial.i18n import gettext as _
 from mercurial.node import *
 demandload(globals(), 'mercurial:cmdutil,util os shutil tempfile')
 
 def dodiff(ui, repo, diffcmd, diffopts, pats, opts):
     def snapshot_node(files, node):
         '''snapshot files as of some revision'''
         changes = repo.changelog.read(node)
         mf = repo.manifest.read(changes[0])
         dirname = '%s.%s' % (os.path.basename(repo.root), short(node))
         base = os.path.join(tmproot, dirname)
         os.mkdir(base)
         if not ui.quiet:
             ui.write_err(_('making snapshot of %d files from rev %s\n') %
                          (len(files), short(node)))
         for fn in files:
+            if not fn in mf:
+                # skipping new file after a merge ?
+                continue
             wfn = util.pconvert(fn)
             ui.note('  %s\n' % wfn)
             dest = os.path.join(base, wfn)
             destdir = os.path.dirname(dest)
             if not os.path.isdir(destdir):
                 os.makedirs(destdir)
             repo.wwrite(wfn, repo.file(fn).read(mf[fn]), open(dest, 'w'))
         return dirname
 
     def snapshot_wdir(files):
         '''snapshot files from working directory.
         if not using snapshot, -I/-X does not work and recursive diff
         in tools like kdiff3 and meld displays too many files.'''
         dirname = os.path.basename(repo.root)
         base = os.path.join(tmproot, dirname)
         os.mkdir(base)
         if not ui.quiet:
             ui.write_err(_('making snapshot of %d files from working dir\n') %
                          (len(files)))
         for fn in files:
             wfn = util.pconvert(fn)
             ui.note('  %s\n' % wfn)
             dest = os.path.join(base, wfn)
             destdir = os.path.dirname(dest)
             if not os.path.isdir(destdir):
                 os.makedirs(destdir)
             fp = open(dest, 'w')
             for chunk in util.filechunkiter(repo.wopener(wfn)):
                 fp.write(chunk)
         return dirname
 
     node1, node2 = cmdutil.revpair(ui, repo, opts['rev'])
     files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
     modified, added, removed, deleted, unknown = repo.status(
         node1, node2, files, match=matchfn)[:5]
     if not (modified or added or removed):
         return 0
 
     tmproot = tempfile.mkdtemp(prefix='extdiff.')
     try:
         dir1 = snapshot_node(modified + removed, node1)
         if node2:
             dir2 = snapshot_node(modified + added, node2)
         else:
             dir2 = snapshot_wdir(modified + added)
         cmdline = ('%s %s %s %s' %
                    (util.shellquote(diffcmd), ' '.join(diffopts),
                     util.shellquote(dir1), util.shellquote(dir2)))
         ui.debug('running %r in %s\n' % (cmdline, tmproot))
         util.system(cmdline, cwd=tmproot)
         return 1
     finally:
         ui.note(_('cleaning up temp directory\n'))
         shutil.rmtree(tmproot)
 
 def extdiff(ui, repo, *pats, **opts):
     '''use external program to diff repository (or selected files)
 
     Show differences between revisions for the specified files, using
     an external program.  The default program used is diff, with
     default options "-Npru".
 
     To select a different program, use the -p option.  The program
     will be passed the names of two directories to compare.  To pass
     additional options to the program, use the -o option.  These will
     be passed before the names of the directories to compare.
 
     When two revision arguments are given, then changes are
     shown between those revisions. If only one revision is
     specified then that revision is compared to the working
     directory, and, when no revisions are specified, the
     working directory files are compared to its parent.'''
     program = opts['program'] or 'diff'
     if opts['program']:
         option = opts['option']
     else:
         option = opts['option'] or ['-Npru']
     return dodiff(ui, repo, program, option, pats, opts)
 
 cmdtable = {
     "extdiff":
     (extdiff,
      [('p', 'program', '', _('comparison program to run')),
       ('o', 'option', [], _('pass option to comparison program')),
       ('r', 'rev', [], _('revision')),
       ('I', 'include', [], _('include names matching the given patterns')),
       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
      _('hg extdiff [OPT]... [FILE]...')),
     }
 
 def uisetup(ui):
     for cmd, path in ui.configitems('extdiff'):
         if not cmd.startswith('cmd.'): continue
         cmd = cmd[4:]
         if not path: path = cmd
         diffopts = ui.config('extdiff', 'opts.' + cmd, '')
         diffopts = diffopts and [diffopts] or []
         def save(cmd, path, diffopts):
             '''use closure to save diff command to use'''
             def mydiff(ui, repo, *pats, **opts):
                 return dodiff(ui, repo, path, diffopts, pats, opts)
             mydiff.__doc__ = '''use %(path)r to diff repository (or selected files)
 
             Show differences between revisions for the specified
             files, using the %(path)r program.
 
             When two revision arguments are given, then changes are
             shown between those revisions. If only one revision is
             specified then that revision is compared to the working
             directory, and, when no revisions are specified, the
             working directory files are compared to its parent.''' % {
                 'path': path,
                 }
             return mydiff
         cmdtable[cmd] = (save(cmd, path, diffopts),
                          cmdtable['extdiff'][1][1:],
                          _('hg %s [OPT]... [FILE]...') % cmd)

tests/test-extdiff

@@ -1,29 +1,38
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "extdiff=" >> $HGRCPATH
 
 hg init a
 cd a
 echo a > a
 hg add
 diff -N /dev/null /dev/null 2> /dev/null
 if [ $? -ne 0 ]; then
 	opt="-p gdiff"
 fi
 hg extdiff -o -Nr $opt
 
 echo "[extdiff]" >> $HGRCPATH
 echo "cmd.falabala=echo" >> $HGRCPATH
 echo "opts.falabala=diffing" >> $HGRCPATH
 
 hg falabala
 
 hg help falabala
 
 hg ci -d '0 0' -mtest1
 
 echo b >> a
 hg ci -d '1 0' -mtest2
 
-hg falabala -r 0:1 || echo "diff-like tools yield a non-zero exit code"
+hg falabala -r 0:1
+
+# test diff during merge
+hg update 0
+echo b >> b
+hg add b
+hg ci -m "new branch" -d '1 0'
+hg update -C 1
+hg merge tip
+hg falabala || echo "diff-like tools yield a non-zero exit code"

tests/test-extdiff.out

@@ -1,32 +1,39
 adding a
 making snapshot of 0 files from rev 000000000000
 making snapshot of 1 files from working dir
 diff -Nr a.000000000000/a a/a
 0a1
 > a
 making snapshot of 0 files from rev 000000000000
 making snapshot of 1 files from working dir
 diffing a.000000000000 a
 hg falabala [OPT]... [FILE]...
 
 use 'echo' to diff repository (or selected files)
 
             Show differences between revisions for the specified
             files, using the 'echo' program.
 
             When two revision arguments are given, then changes are
             shown between those revisions. If only one revision is
             specified then that revision is compared to the working
             directory, and, when no revisions are specified, the
             working directory files are compared to its parent.
 
 options:
 
  -o --option   pass option to comparison program
  -r --rev      revision
  -I --include  include names matching the given patterns
  -X --exclude  exclude names matching the given patterns
 making snapshot of 1 files from rev e27a2475d60a
 making snapshot of 1 files from rev 5e49ec8d3f05
 diffing a.e27a2475d60a a.5e49ec8d3f05
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+making snapshot of 1 files from rev 5e49ec8d3f05
+making snapshot of 1 files from working dir
+diffing a.5e49ec8d3f05 a
 diff-like tools yield a non-zero exit code

tests/test-merge1

@@ -1,96 +1,104
 #!/bin/sh
 
 cat <<'EOF' > merge
 #!/bin/sh
 echo merging for `basename $1`
 EOF
 chmod +x merge
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "1000000 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "1000000 0"
 
 hg update 0
 echo This is file c1 > c
 hg add c
 hg commit -m "commit #2" -d "1000000 0"
 echo This is file b1 > b
 echo %% no merges expected
 env HGMERGE=../merge hg merge 1
+hg diff --nodates
+hg status
 cd ..; /bin/rm -rf t
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "1000000 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "1000000 0"
 
 hg update 0
 echo This is file c1 > c
 hg add c
 hg commit -m "commit #2" -d "1000000 0"
 echo This is file b2 > b
 echo %% merge should fail
 env HGMERGE=../merge hg merge 1
 echo %% merge of b expected
 env HGMERGE=../merge hg merge -f 1
+hg diff --nodates
+hg status
 cd ..; /bin/rm -rf t
 echo %%
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "1000000 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "1000000 0"
 echo This is file b22 > b
 hg commit -m "commit #2" -d "1000000 0"
 hg update 1
 echo This is file c1 > c
 hg add c
 hg commit -m "commit #3" -d "1000000 0"
 
 echo 'Contents of b should be "this is file b1"'
 cat b
 
 echo This is file b22 > b
 echo %% merge fails
 env HGMERGE=../merge hg merge 2
 echo %% merge expected!
 env HGMERGE=../merge hg merge -f 2
+hg diff --nodates
+hg status
 cd ..; /bin/rm -rf t
 
 mkdir t
 cd t
 hg init
 echo This is file a1 > a
 hg add a
 hg commit -m "commit #0" -d "1000000 0"
 echo This is file b1 > b
 hg add b
 hg commit -m "commit #1" -d "1000000 0"
 echo This is file b22 > b
 hg commit -m "commit #2" -d "1000000 0"
 hg update 1
 echo This is file c1 > c
 hg add c
 hg commit -m "commit #3" -d "1000000 0"
 echo This is file b33 > b
 echo %% merge of b should fail
 env HGMERGE=../merge hg merge 2
 echo %% merge of b expected
 env HGMERGE=../merge hg merge -f 2
+hg diff --nodates
+hg status
 cd ..; /bin/rm -rf t

tests/test-merge1.out

@@ -1,33 +1,59
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 %% no merges expected
 merging for b
 merging b
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
+diff -r d9e5953b9dec b
+--- /dev/null
++++ b/b
+@@ -0,0 +1,1 @@
++This is file b1
+M b
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 %% merge should fail
 abort: 'b' already exists in the working dir and differs from remote
 %% merge of b expected
 merging for b
 merging b
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
+diff -r d9e5953b9dec b
+--- /dev/null
++++ b/b
+@@ -0,0 +1,1 @@
++This is file b2
+M b
 %%
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Contents of b should be "this is file b1"
 This is file b1
 %% merge fails
 abort: outstanding uncommitted changes
 %% merge expected!
 merging for b
 merging b
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
+diff -r c1dd73cbf59f b
+--- a/b
++++ b/b
+@@ -1,1 +1,1 @@ This is file b1
+-This is file b1
++This is file b22
+M b
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 %% merge of b should fail
 abort: outstanding uncommitted changes
 %% merge of b expected
 merging for b
 merging b
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
+diff -r c1dd73cbf59f b
+--- a/b
++++ b/b
+@@ -1,1 +1,1 @@ This is file b1
+-This is file b1
++This is file b33
+M b