diff --git a/infinitepush/backupcommands.py b/infinitepush/backupcommands.py --- a/infinitepush/backupcommands.py +++ b/infinitepush/backupcommands.py @@ -456,7 +456,8 @@ return 0 def _dobackupcheck(bkpstate, ui, repo, dest, **opts): - remotehexnodes = list(bkpstate.heads) + bkpstate.localbookmarks.values() + remotehexnodes = sorted( + set(bkpstate.heads).union(bkpstate.localbookmarks.values())) if not remotehexnodes: return True other = _getremote(repo, ui, dest, **opts) @@ -465,14 +466,15 @@ batch.lookup(hexnode) batch.submit() lookupresults = batch.results() + i = 0 try: - for r in lookupresults: + for i, r in enumerate(lookupresults): # iterate over results to make it throw if revision # was not found pass return True - except error.RepoError as e: - ui.warn(_('%s\n') % e) + except error.RepoError: + ui.warn(_('unknown revision %r\n') % remotehexnodes[i]) return False _backuplatestinfofile = 'infinitepushlatestbackupinfo' diff --git a/tests/test-infinitepush-pullbackup.t b/tests/test-infinitepush-pullbackup.t --- a/tests/test-infinitepush-pullbackup.t +++ b/tests/test-infinitepush-pullbackup.t @@ -221,11 +221,17 @@ [255] $ hg debugcheckbackup --user anotheruser --reporoot $TESTTMP/backupsource checking \$TESTTMP/backupsource on .* (re) - $ hg debugcheckbackup --all | sort + unknown revision 'e0230a60975b38a9014f098fb973199efd25c46f' + [255] + $ hg debugcheckbackup --all 2>&1 | sort checking \$TESTTMP on .* (re) checking \$TESTTMP/backupsource on .* (re) checking \$TESTTMP/backupsource2 on .* (re) checking \$TESTTMP/bookmarks/backupsource3 on .* (re) + unknown revision '0e1a088ff2825213eaa838a82a842bc186f10dd5' + unknown revision 'a2a9ae518b62f1d9d1e884d2c16f87bb2e368c5c' + unknown revision 'a2a9ae518b62f1d9d1e884d2c16f87bb2e368c5c' + unknown revision 'c1bfda8efb6e73473d6874e35125861a34a5594d' $ rm ../repo/.hg/scratchbranches/index/nodemap/e0230a60975b38a9014f098fb973199efd25c46f $ hg debugcheckbackup --user anotheruser --reporoot $TESTTMP/backupsource checking \$TESTTMP/backupsource on .* (re) @@ -244,10 +250,11 @@ remote: c03baa769a20 newcommit finished in \d+\.(\d+)? seconds (re) $ cd ../backupsource - $ hg debugcheckbackup --user anotheruser --all | sort - unknown revision 'e0230a60975b38a9014f098fb973199efd25c46f' + $ hg debugcheckbackup --user anotheruser --all 2>&1 | sort checking \$TESTTMP/backupsource on .* (re) checking \$TESTTMP/backupsource2 on .* (re) + unknown revision 'c03baa769a209c549603380d7bf496aaf42687bb' + unknown revision 'e0230a60975b38a9014f098fb973199efd25c46f' Test getavailablebackups command $ hg getavailablebackups