diff 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
line wrap: on
line diff
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -839,13 +839,13 @@ def pull(ui, repo, source="default", **o
 
     return r
 
-def push(ui, repo, dest="default-push"):
+def push(ui, repo, dest="default-push", force=False):
     """push changes to the specified destination"""
     dest = ui.expandpath(dest)
     ui.status('pushing to %s\n' % (dest))
 
     other = hg.repository(ui, dest)
-    r = repo.push(other)
+    r = repo.push(other, force)
     return r
 
 def rawcommit(ui, repo, *flist, **rc):
@@ -1228,7 +1228,10 @@ table = {
         (pull,
          [('u', 'update', None, 'update working directory')],
          'hg pull [-u] [SOURCE]'),
-    "^push": (push, [], 'hg push [DEST]'),
+    "^push":
+        (push,
+         [('f', 'force', None, 'force push')],
+         'hg push [DEST]'),
     "rawcommit":
         (rawcommit,
          [('p', 'parent', [], 'parent'),