archive: fix changesincelatesttag with wdir()

mercurial/archival.py

@@ -86,7 +86,11 b' def buildmetadata(ctx):'
         ltags, dist = repo.ui.popbuffer().split('\n')
         ltags = ltags.split(':')
         # XXX: ctx.rev() needs to be handled differently with wdir()
-        changessince = len(repo.revs('only(%d,%s)', ctx.rev(), ltags[0]))
+        if ctx.rev() is None:
+            changessince = len(repo.revs('only(%d,%s)', ctx.p1(),
+                                         ltags[0])) + 1
+        else:
+            changessince = len(repo.revs('only(%d,%s)', ctx.rev(), ltags[0]))
         tags = ''.join('latesttag: %s\n' % t for t in ltags)
         tags += 'latesttagdistance: %s\n' % dist
         tags += 'changessincelatesttag: %s\n' % changessince

tests/test-subrepo-deep-nested-change.t

@@ -193,7 +193,7 b' Archive wdir() with subrepos'
   branch: default
   latesttag: null
   latesttagdistance: 4
-  changessincelatesttag: 3
+  changessincelatesttag: 4
 
 Attempting to archive 'wdir()' with a missing file is handled gracefully
   $ rm sub1/sub1
@@ -220,7 +220,7 b' Continue relative path printing + subrep'
   branch: default
   latesttag: null
   latesttagdistance: 4
-  changessincelatesttag: 3
+  changessincelatesttag: 4
 
   $ touch sub1/sub2/folder/bar
   $ hg addremove sub1/sub2