comparison hgext/git/manifest.py @ 45942:89a2afe31e82

formating: upgrade to black 20.8b1 This required a couple of small tweaks to un-confuse black, but now it works. Big formatting changes come from: * Dramatically improved collection-splitting logic upstream * Black having a strong (correct IMO) opinion that """ is better than ''' Differential Revision: https://phab.mercurial-scm.org/D9430
author Augie Fackler <raf@durin42.com>
date Fri, 27 Nov 2020 17:03:29 -0500
parents 73a5aa5e1857
children 6000f5b25c9b
comparison
equal deleted inserted replaced
45941:346af7687c6f 45942:89a2afe31e82
125 125
126 def hasdir(self, dir): 126 def hasdir(self, dir):
127 return dir in self._dirs 127 return dir in self._dirs
128 128
129 def diff(self, other, match=lambda x: True, clean=False): 129 def diff(self, other, match=lambda x: True, clean=False):
130 '''Finds changes between the current manifest and m2. 130 """Finds changes between the current manifest and m2.
131 131
132 The result is returned as a dict with filename as key and 132 The result is returned as a dict with filename as key and
133 values of the form ((n1,fl1),(n2,fl2)), where n1/n2 is the 133 values of the form ((n1,fl1),(n2,fl2)), where n1/n2 is the
134 nodeid in the current/other manifest and fl1/fl2 is the flag 134 nodeid in the current/other manifest and fl1/fl2 is the flag
135 in the current/other manifest. Where the file does not exist, 135 in the current/other manifest. Where the file does not exist,
136 the nodeid will be None and the flags will be the empty 136 the nodeid will be None and the flags will be the empty
137 string. 137 string.
138 ''' 138 """
139 result = {} 139 result = {}
140 140
141 def _iterativediff(t1, t2, subdir): 141 def _iterativediff(t1, t2, subdir):
142 """compares two trees and appends new tree nodes to examine to 142 """compares two trees and appends new tree nodes to examine to
143 the stack""" 143 the stack"""