Mercurial > hg
changeset 6816:d8159dd15db3
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 20 Jul 2008 21:51:13 +0200 |
| parents | fdf5980bd010 (current diff) 7d6622eaad08 (diff) |
| children | cf319797d61c |
| files | hgext/convert/cvs.py mercurial/commands.py |
| diffstat | 4 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/cvs.py Sun Jul 20 20:00:02 2008 +0200 +++ b/hgext/convert/cvs.py Sun Jul 20 21:51:13 2008 +0200 @@ -201,7 +201,7 @@ if not passw: passw = "A" - pf = open(os.path.join(os.environ["HOME"], ".cvspass")) + pf = open(os.path.expanduser("~/.cvspass")) for line in pf.read().splitlines(): part1, part2 = line.split(' ', 1) if part1 == '/1':
--- a/mercurial/commands.py Sun Jul 20 20:00:02 2008 +0200 +++ b/mercurial/commands.py Sun Jul 20 21:51:13 2008 +0200 @@ -389,10 +389,10 @@ if ui.quiet: ui.write("%s\n" % tag) else: - rev = str(node).rjust(32 - util.locallen(tag)) + rev = str(node).rjust(31 - util.locallen(tag)) isinactive = ((not isactive) and " (inactive)") or '' data = tag, rev, hexfunc(repo.lookup(node)), isinactive - ui.write("%s%s:%s%s\n" % data) + ui.write("%s %s:%s%s\n" % data) def bundle(ui, repo, fname, dest=None, **opts): """create a changegroup file
--- a/tests/test-branches Sun Jul 20 20:00:02 2008 +0200 +++ b/tests/test-branches Sun Jul 20 21:51:13 2008 +0200 @@ -33,7 +33,7 @@ echo 'd' >d hg add d -hg branch d +hg branch 'a branch name much longer than the default justification used by branches' hg commit -d '6 0' -u test -m "Adding d branch" hg branches
--- a/tests/test-branches.out Sun Jul 20 20:00:02 2008 +0200 +++ b/tests/test-branches.out Sun Jul 20 21:51:13 2008 +0200 @@ -5,14 +5,14 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head marked working directory as branch c -marked working directory as branch d -d 6:9c581c5ff105 +marked working directory as branch a branch name much longer than the default justification used by branches +a branch name much longer than the default justification used by branches 6:b8cb5af34c4d b 4:22df7444f7c1 a 1:dd6b440dd85a c 5:5ca481e59b8c (inactive) default 0:19709c5a4e75 (inactive) ------- -d 6:9c581c5ff105 +a branch name much longer than the default justification used by branches 6:b8cb5af34c4d b 4:22df7444f7c1 a 1:dd6b440dd85a --- Branch a