← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patches.py

  • Committer: Aaron Bentley
  • Date: 2006-05-30 03:51:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: aaron.bentley@utoronto.ca-20060530035103-1828900762221412
Removed confusing text from the test module

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_patches.py
117
117
 
118
118
    def testAll(self):
119
119
        """Test parsing a whole patch"""
120
 
        patchtext = """--- orig/commands.py
121
 
+++ mod/commands.py
122
 
@@ -1337,7 +1337,8 @@
123
 
 
124
 
     def set_title(self, command=None):
125
 
         try:
126
 
-            version = self.tree.tree_version.nonarch
127
 
+            version = pylon.alias_or_version(self.tree.tree_version, self.tree,
128
 
+                                             full=False)
129
 
         except:
130
 
             version = "[no version]"
131
 
         if command is None:
132
 
@@ -1983,7 +1984,11 @@
133
 
                                          version)
134
 
         if len(new_merges) > 0:
135
 
             if cmdutil.prompt("Log for merge"):
136
 
-                mergestuff = cmdutil.log_for_merge(tree, comp_version)
137
 
+                if cmdutil.prompt("changelog for merge"):
138
 
+                    mergestuff = "Patches applied:\\n"
139
 
+                    mergestuff += pylon.changelog_for_merge(new_merges)
140
 
+                else:
141
 
+                    mergestuff = cmdutil.log_for_merge(tree, comp_version)
142
 
                 log.description += mergestuff
143
 
         log.save()
144
 
     try:
145
 
"""
 
120
        patchtext = self.datafile("patchtext.patch").read()
146
121
        self.compare_parsed(patchtext)
147
122
 
148
123
    def testInit(self):
149
124
        """Handle patches missing half the position, range tuple"""
150
125
        patchtext = \
151
 
"""--- orig/__init__.py
152
 
+++ mod/__init__.py
 
126
"""--- orig/__vavg__.cl
 
127
+++ mod/__vavg__.cl
153
128
@@ -1 +1,2 @@
154
 
 __docformat__ = "restructuredtext en"
155
 
+__doc__ = An alternate Arch commandline interface
 
129
 __qbpsbezng__ = "erfgehpgherqgrkg ra"
 
130
+__qbp__ = Na nygreangr Nepu pbzznaqyvar vagresnpr
156
131
"""
157
132
        self.compare_parsed(patchtext)
158
133