Lines Matching refs:diff
21 Diff options are passed to the diff command of the underlying system.
28 It is important for Git/Mercurial users to specify a tree/node/branch to diff
452 help="Branch/tree/revision to diff
600 """Return the current diff as a string.
603 args: Extra arguments to pass to the diff command.
632 the contents of the new file, since the diff output won't contain
642 def GetBaseFiles(self, diff):
651 for line in diff.splitlines(True):
791 cmd = ["svn", "diff"]
802 ErrorExit("No valid patches found in output from svn diff")
807 # svn cat translates keywords but svn diff doesn't. As a result of this
870 # If we have a revision to diff against we need to run "svn list"
905 # upload the original file or else diff parsing will fail if the file was
909 # since diff's output won't contain it.
995 # the diff output to include an svn-style "Index:" line as well as record
996 # the hashes of the base files, so we can upload them along with our diff.
999 gitdiff = RunShell(["git", "diff", "--full-index"] + extra_args)
1004 match = re.match(r"diff --git a/(.*) b/.*$", line)
1010 # The "index" line in a git diff looks like this (long hashes elided):
1018 ErrorExit("No valid patches found in output from git diff")
1067 cmd = ["hg", "diff", "--git", "-r", self.base_rev] + extra_args
1072 m = re.match("diff --git a/(\S+) b/(\S+)", line)
1074 # Modify line to make it look like as it comes from svn diff.
1087 ErrorExit("No valid patches found in output from hg diff")
1104 # rather than to the repo root, but "hg diff" has given us the full path
1145 data: A string containing the output of svn diff.
1148 A list of 2-tuple (filename, text) where text is the svn diff output
1153 diff = []
1166 # File has property changes but no modifications, create a new diff.
1169 if filename and diff:
1170 patches.append((filename, ''.join(diff)))
1172 diff = [line]
1174 if diff is not None:
1175 diff.append(line)
1176 if filename and diff:
1177 patches.append((filename, ''.join(diff)))
1182 """Uploads a separate patch for each file in the diff output.
1196 files = [("data", "data.diff", patch[1])]
1255 data: Diff contents. If None (default) the diff is generated by
1345 uploaded_diff_file = [("data", "data.diff", data)]
