hg.stevelosh.com > hg-review

fa1f7726b08b 

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Mon, 18 Jul 2011 13:22:12 -0400
parents 543110450d50 (diff) 48541d29e527 (current diff)
children 78819a1b530e
branches/tags (none)
files bundled/flask/flask.py kick review/api.py review/static/aal.css review/static/bg.png review/static/colorbox/colorbox.css review/static/colorbox/images/border.png review/static/colorbox/images/controls.png review/static/colorbox/images/internet_explorer/borderBottomCenter.png review/static/colorbox/images/internet_explorer/borderBottomLeft.png review/static/colorbox/images/internet_explorer/borderBottomRight.png review/static/colorbox/images/internet_explorer/borderMiddleLeft.png review/static/colorbox/images/internet_explorer/borderMiddleRight.png review/static/colorbox/images/internet_explorer/borderTopCenter.png review/static/colorbox/images/internet_explorer/borderTopLeft.png review/static/colorbox/images/internet_explorer/borderTopRight.png review/static/colorbox/images/loading.gif review/static/colorbox/images/loading_background.png review/static/colorbox/images/overlay.png review/static/colorbox/jquery.colorbox.js review/static/comments.js review/static/extra.css review/static/jquery-1.4.2.min.js review/static/jquery.infieldlabel.min.js review/static/style.css review/static/style.less review/static/ui.js review/static/underscore.min.js

Changes

--- a/review/api.py	Wed Jun 29 19:47:16 2011 -0400
+++ b/review/api.py	Mon Jul 18 13:22:12 2011 -0400
@@ -5,7 +5,7 @@
 import base64, datetime, operator, os
 import messages
 from rutil import fromlocal
-from mercurial import cmdutil, error, hg, patch, util
+from mercurial import cmdutil, error, hg, patch, scmutil, util
 from mercurial.node import hex
 from mercurial import ui as _ui
 from mercurial import demandimport
@@ -280,7 +280,7 @@
             except error.RepoError:
                 if clone_message:
                     ui.write(messages.INIT_CLONE_MESSAGE % self.rpath)
-                hg.clone(hg.remoteui(self.ui, {}), self.rpath, self.lpath)
+                hg.clone(hg.remoteui(self.ui, {}), {}, self.rpath, self.lpath)
             else:
                 raise PreexistingDatastore(True)
         elif os.path.exists(os.path.join(self.target.root, '.hgreview')):
@@ -561,7 +561,7 @@
 
         diffs = {}
         for filename in filenames:
-            m = cmdutil.matchfiles(self.target, [filename])
+            m = scmutil.matchfiles(self.target, [filename])
             diff_opts = patch.diffopts(self.ui, opts)
             diff_opts.git = True
             d = patch.diff(self.target, node1, node2, match=m, opts=diff_opts)
--- a/review/tests/util.py	Wed Jun 29 19:47:16 2011 -0400
+++ b/review/tests/util.py	Mon Jul 18 13:22:12 2011 -0400
@@ -135,7 +135,7 @@
     return hg.repository(_ui, sandbox_clone_path)
 
 def clone_sandbox_repo():
-    hg.clone(hg.remoteui(_ui, {}), sandbox_repo_path, sandbox_clone_path)
+    hg.clone(hg.remoteui(_ui, {}), {}, sandbox_repo_path, sandbox_clone_path)
 
 def get_datastore_repo(path=api.DEFAULT_DATASTORE_DIRNAME):
     return hg.repository(_ui, path)