facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-12-29 08:02:24 +03:00
Code Issues Projects Releases Wiki Activity

Merge with default

Browse Source
This commit is contained in:
Durham Goode 2015-01-28 13:17:21 -08:00
commit 6c8677d403
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backups.py
View File

@ -10,7 +10,7 @@ from mercurial import extensions, util, cmdutil, commands, error, bundlerepo
from mercurial import hg, changegroup, exchange
from mercurial.extensions import wrapfunction
from hgext import pager
from mercurial.node import hex, nullrev, nullid
from mercurial.node import hex, nullrev, nullid, short
from mercurial.i18n import _
import errno, os, re, glob, time
@ -72,11 +72,8 @@ def backups(ui, repo, *pats, **opts):
try:
other = hg.peer(repo, opts, source)
except error.LookupError as ex:
if not '@' in str(ex):
raise
missingrev = str(ex).split('@')[-1].split(':')[0]
ui.status("\nwarning: unable to open bundle %s - missing parent rev %s\n" %
(source, missingrev))
(source, short(ex.name)))
continue
revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))