Mercurial > hg
comparison mercurial/bookmarks.py @ 15984:894f83a35653 stable
bookmarks: respect --debug during incoming/outgoing
| author | David Soria Parra <dsp@php.net> |
|---|---|
| date | Wed, 25 Jan 2012 20:03:46 +0100 |
| parents | 60cb4f381a78 |
| children | 7c75924a6926 |
comparison
equal
deleted
inserted
replaced
| 15983:32b9aee3602c | 15984:894f83a35653 |
|---|---|
| 219 lmarks = repo.listkeys('bookmarks') | 219 lmarks = repo.listkeys('bookmarks') |
| 220 rmarks = remote.listkeys('bookmarks') | 220 rmarks = remote.listkeys('bookmarks') |
| 221 | 221 |
| 222 diff = sorted(set(rmarks) - set(lmarks)) | 222 diff = sorted(set(rmarks) - set(lmarks)) |
| 223 for k in diff: | 223 for k in diff: |
| 224 ui.write(" %-25s %s\n" % (k, rmarks[k][:12])) | 224 mark = ui.debugflag and rmarks[k] or rmarks[k][:12] |
| 225 ui.write(" %-25s %s\n" % (k, mark)) | |
| 225 | 226 |
| 226 if len(diff) <= 0: | 227 if len(diff) <= 0: |
| 227 ui.status(_("no changed bookmarks found\n")) | 228 ui.status(_("no changed bookmarks found\n")) |
| 228 return 1 | 229 return 1 |
| 229 return 0 | 230 return 0 |