Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 838:0fc4b1ab57e3
Merge with Matt.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu, 04 Aug 2005 05:14:59 -0800 |
| parents | a95c9b3fc3bf eef752151556 |
| children | 9c918287d10b |
comparison
equal
deleted
inserted
replaced
| 837:a95c9b3fc3bf | 838:0fc4b1ab57e3 |
|---|---|
| 837 else: | 837 else: |
| 838 ui.status("(run 'hg update' to get a working copy)\n") | 838 ui.status("(run 'hg update' to get a working copy)\n") |
| 839 | 839 |
| 840 return r | 840 return r |
| 841 | 841 |
| 842 def push(ui, repo, dest="default-push"): | 842 def push(ui, repo, dest="default-push", force=False): |
| 843 """push changes to the specified destination""" | 843 """push changes to the specified destination""" |
| 844 dest = ui.expandpath(dest) | 844 dest = ui.expandpath(dest) |
| 845 ui.status('pushing to %s\n' % (dest)) | 845 ui.status('pushing to %s\n' % (dest)) |
| 846 | 846 |
| 847 other = hg.repository(ui, dest) | 847 other = hg.repository(ui, dest) |
| 848 r = repo.push(other) | 848 r = repo.push(other, force) |
| 849 return r | 849 return r |
| 850 | 850 |
| 851 def rawcommit(ui, repo, *flist, **rc): | 851 def rawcommit(ui, repo, *flist, **rc): |
| 852 "raw commit interface" | 852 "raw commit interface" |
| 853 if rc['text']: | 853 if rc['text']: |
| 1226 "paths": (paths, [], 'hg paths [name]'), | 1226 "paths": (paths, [], 'hg paths [name]'), |
| 1227 "^pull": | 1227 "^pull": |
| 1228 (pull, | 1228 (pull, |
| 1229 [('u', 'update', None, 'update working directory')], | 1229 [('u', 'update', None, 'update working directory')], |
| 1230 'hg pull [-u] [SOURCE]'), | 1230 'hg pull [-u] [SOURCE]'), |
| 1231 "^push": (push, [], 'hg push [DEST]'), | 1231 "^push": |
| 1232 (push, | |
| 1233 [('f', 'force', None, 'force push')], | |
| 1234 'hg push [DEST]'), | |
| 1232 "rawcommit": | 1235 "rawcommit": |
| 1233 (rawcommit, | 1236 (rawcommit, |
| 1234 [('p', 'parent', [], 'parent'), | 1237 [('p', 'parent', [], 'parent'), |
| 1235 ('d', 'date', "", 'date code'), | 1238 ('d', 'date', "", 'date code'), |
| 1236 ('u', 'user', "", 'user'), | 1239 ('u', 'user', "", 'user'), |