[Pkg-bazaar-commits] ./bzr/unstable r494: - commit takes an optional caller-specified revision id

[Martin Pool]

------------------------------------------------------------
revno: 494
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-05-16 11:54:16 +1000
message:
  - commit takes an optional caller-specified revision id
modified:
  bzrlib/commit.py
-------------- next part --------------
=== modified file 'bzrlib/commit.py'
--- a/bzrlib/commit.py	2005-05-12 03:10:29 +0000
+++ b/bzrlib/commit.py	2005-05-16 01:54:16 +0000
@@ -19,7 +19,8 @@
 def commit(branch, message, timestamp=None, timezone=None,
            committer=None,
            verbose=True,
-           specific_files=None):
+           specific_files=None,
+           rev_id=None):
     """Commit working copy as a new revision.
 
     The basic approach is to add all the file texts into the
@@ -164,7 +165,9 @@
             del work_inv[file_id]
 
 
-    inv_id = rev_id = _gen_revision_id(time.time())
+    if rev_id is None:
+        rev_id = _gen_revision_id(time.time())
+    inv_id = rev_id
 
     inv_tmp = tempfile.TemporaryFile()
     inv.write_xml(inv_tmp)