Changeset 469 in tailor

Timestamp:

08/03/05 02:45:24 (8 years ago)

Author:

lele@…

Hash name:

20050803004524-97f81-8f35f3ab12b06a4202f38f61bd6f763d487d6aff

Message:

Use the new 'pending' methods

File:

• vcpx/tailor.py (modified) (2 diffs)

vcpx/tailor.py

@@ -415 +415 @@
         try:
             dwd = DualWorkingDir(self.source_kind, self.target_kind)
-            changesets = dwd._getUpstreamChangesets(proj,
-                                                   self.upstream_repos,
-                                                   self.upstream_module,
-                                                   self.upstream_revision)
+            changesets = dwd.getPendingChangesets(proj,
+                                                  self.upstream_repos,
+                                                  self.upstream_module)
         except KeyboardInterrupt:
             print "Leaving '%s' unchanged" % proj
@@ -433 +432 @@
 
             try:
-                last, conflicts = dwd.applyUpstreamChangesets(
-                    proj, self.upstream_module, changesets,
+                last, conflicts = dwd.applyPendingChangesets(
+                    proj, self.upstream_module,
                     applyable=self.applyable,
                     applied=self.applied, logger=self.logger,