Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/hg.py @ 9788:75520c24feda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Branch name printed since a3d73b3e1f8a now in local encoding.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 07 Nov 2009 23:35:46 +0100
parents 2f1ab7f77ddc
children 439d7ea6fe3a
comparison
equal deleted inserted replaced
9787:b1dad6b4dfae 9788:75520c24feda
7 # GNU General Public License version 2, incorporated herein by reference. 7 # GNU General Public License version 2, incorporated herein by reference.
8 8
9 from i18n import _ 9 from i18n import _
10 from lock import release 10 from lock import release
11 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo 11 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo
12 import lock, util, extensions, error 12 import lock, util, extensions, error, encoding
13 import merge as _merge 13 import merge as _merge
14 import verify as _verify 14 import verify as _verify
15 import errno, os, shutil 15 import errno, os, shutil
16 16
17 def _local(path): 17 def _local(path):
318 uprev = dest_repo.lookup(test) 318 uprev = dest_repo.lookup(test)
319 break 319 break
320 except error.RepoLookupError: 320 except error.RepoLookupError:
321 continue 321 continue
322 bn = dest_repo[uprev].branch() 322 bn = dest_repo[uprev].branch()
323 dest_repo.ui.status(_("updating to branch %s\n") % bn) 323 dest_repo.ui.status(_("updating to branch %s\n")
324 % encoding.tolocal(bn))
324 _update(dest_repo, uprev) 325 _update(dest_repo, uprev)
325 326
326 return src_repo, dest_repo 327 return src_repo, dest_repo
327 finally: 328 finally:
328 release(src_lock, dest_lock) 329 release(src_lock, dest_lock)