Lines Matching refs:diff
36 Diff options are passed to the diff command of the underlying system.
43 It is important for Git/Mercurial users to specify a tree/node/branch to diff
467 help="Branch/tree/revision to diff against (used by DVCS).")
615 """Return the current diff as a string.
618 args: Extra arguments to pass to the diff command.
647 the contents of the new file, since the diff output won't contain
657 def GetBaseFiles(self, diff):
666 for line in diff.splitlines(True):
806 cmd = ["svn", "diff"]
817 ErrorExit("No valid patches found in output from svn diff")
822 # svn cat translates keywords but svn diff doesn't. As a result of this
885 # If we have a revision to diff against we need to run "svn list"
920 # upload the original file or else diff parsing will fail if the file was
924 # since diff's output won't contain it.
1010 # the diff output to include an svn-style "Index:" line as well as record
1011 # the hashes of the base files, so we can upload them along with our diff.
1014 gitdiff = RunShell(["git", "diff", "--full-index"] + extra_args)
1019 match = re.match(r"diff --git a/(.*) b/.*$", line)
1025 # The "index" line in a git diff looks like this (long hashes elided):
1033 ErrorExit("No valid patches found in output from git diff")
1082 cmd = ["hg", "diff", "--git", "-r", self.base_rev] + extra_args
1087 m = re.match("diff --git a/(\S+) b/(\S+)", line)
1089 # Modify line to make it look like as it comes from svn diff.
1102 ErrorExit("No valid patches found in output from hg diff")
1119 # rather than to the repo root, but "hg diff" has given us the full path
1160 data: A string containing the output of svn diff.
1163 A list of 2-tuple (filename, text) where text is the svn diff output
1168 diff = []
1181 # File has property changes but no modifications, create a new diff.
1184 if filename and diff:
1185 patches.append((filename, ''.join(diff)))
1187 diff = [line]
1189 if diff is not None:
1190 diff.append(line)
1191 if filename and diff:
1192 patches.append((filename, ''.join(diff)))
1197 """Uploads a separate patch for each file in the diff output.
1211 files = [("data", "data.diff", patch[1])]
1270 data: Diff contents. If None (default) the diff is generated by
1360 uploaded_diff_file = [("data", "data.diff", data)]