Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

cache: same state names as in output of stat command

Changeset 1d9f03cd929a…

Parent 25a749a2c8fb…

by Simon Heimberg

Changes to one file · Browse files at 1d9f03cd929a Showing diff from parent 25a749a2c8fb Diff from another changeset...

Change 1 of 8 Show Entire File tortoise/​cachethg.py Stacked
 
14
15
16
17
18
19
20
21
22
23
 
 
 
 
 
24
25
26
 
47
48
49
50
 
 
51
52
53
 
73
74
75
76
 
77
78
 
79
80
81
 
85
86
87
88
 
89
90
91
 
94
95
96
97
 
98
99
100
 
103
104
105
106
 
107
108
109
110
 
111
112
113
 
122
123
124
125
 
126
127
128
129
130
 
131
132
133
134
135
 
136
137
138
 
143
144
145
146
 
147
148
149
150
151
152
153
154
155
156
157
158
159
160
 
 
 
 
161
162
163
164
165
166
 
167
168
169
170
171
172
173
174
 
 
14
15
16
 
 
 
 
 
 
 
17
18
19
20
21
22
23
24
 
45
46
47
 
48
49
50
51
52
 
72
73
74
 
75
76
 
77
78
79
80
 
84
85
86
 
87
88
89
90
 
93
94
95
 
96
97
98
99
 
102
103
104
 
105
106
107
108
 
109
110
111
112
 
121
122
123
 
124
125
126
127
128
 
129
130
131
132
133
 
134
135
136
137
 
142
143
144
 
145
146
147
 
148
149
150
 
 
 
 
 
 
 
 
151
152
153
154
155
156
157
158
 
 
159
160
161
162
163
164
165
 
 
166
@@ -14,13 +14,11 @@
  from time import time as GetTickCount   CACHE_TIMEOUT = 5.0   -UNCHANGED = "unchanged" -ADDED = "added" -MODIFIED = "modified" -UNKNOWN = "unknown" -IGNORED = "ignored" -NOT_IN_REPO = "n/a" -ROOT = "root" +STATUS_STATES = 'MAR!?IC' +MODIFIED, ADDED, REMOVED, DELETED, UNKNOWN, IGNORED, UNCHANGED = STATUS_STATES +NOT_IN_REPO = ' ' +ROOT = "r" +    # file status cache  overlay_cache = {} @@ -47,7 +45,8 @@
  """   Get the state of a given path in source control.   """ - return get_states(upath, repo)[-1] + states = get_states(upath, repo) + return states and states[0] or NOT_IN_REPO      def get_states(upath, repo=None): @@ -73,9 +72,9 @@
  if not status:   if os.path.isdir(os.path.join(path, '.hg')):   add(path, ROOT) - status = ROOT, + status = ROOT   else: - status = overlay_cache.get(pdir, [NOT_IN_REPO]) + status = overlay_cache.get(pdir, NOT_IN_REPO)   print "%s: %s (cached)" % (path, status)   return status   else: @@ -85,7 +84,7 @@
  # path is a drive   if path.endswith(":\\"):   add(path, NOT_IN_REPO) - return [NOT_IN_REPO] + return NOT_IN_REPO   # open repo   if cache_pdir == pdir:   root = cache_root @@ -94,7 +93,7 @@
  root = thgutil.find_root(path)   if root == path:   add(path, ROOT) - return [ROOT] + return ROOT   cache_root = root   cache_pdir = pdir   @@ -103,11 +102,11 @@
  print "_get_state: not in repo"   overlay_cache = {None: None}   cache_tick_count = GetTickCount() - return [NOT_IN_REPO] + return NOT_IN_REPO   hgdir = os.path.join(root, '.hg', '')   if pdir == hgdir[:-1] or pdir.startswith(hgdir):   add(pdir, NOT_IN_REPO) - return [NOT_IN_REPO] + return NOT_IN_REPO   try:   tc1 = GetTickCount()   if not repo or (repo.root != root and repo.root != os.path.realpath(root)): @@ -122,17 +121,17 @@
  print "%s: overlayicons disabled" % path   overlay_cache = {None: None}   cache_tick_count = GetTickCount() - return [NOT_IN_REPO] + return NOT_IN_REPO   except RepoError:   # We aren't in a working tree   print "%s: not in repo" % pdir   add(pdir, IGNORED) - return [IGNORED] + return IGNORED   except StandardError, e:   print "error while handling %s:" % pdir   print e   add(pdir, UNKNOWN) - return [UNKNOWN] + return UNKNOWN   # get file status   tc1 = GetTickCount()   @@ -143,32 +142,25 @@
  except util.Abort, inst:   print "abort: %s" % inst   print "treat as unknown : %s" % path - return [UNKNOWN] + return UNKNOWN     print "status() took %g ticks" % (GetTickCount() - tc1) - modified, added, removed, deleted, unknown, ignored, clean = repostate   # cached file info   tc = GetTickCount()   overlay_cache = {} - for grp, st in ( - (ignored, IGNORED), - (unknown, UNKNOWN), - (clean, UNCHANGED), - (added, ADDED), - (removed, MODIFIED), - (deleted, MODIFIED), - (modified, MODIFIED)): + add(root, ROOT) + states = zip(repostate, STATUS_STATES) + states[-1], states[-2] = states[-2], states[-1] #clean before ignored + for grp, st in states:   add_dirs(grp)   for f in grp:   fpath = os.path.join(root, os.path.normpath(f))   add(fpath, st) - add(root, ROOT) - status = overlay_cache.get(path, [UNKNOWN]) + status = overlay_cache.get(path, UNKNOWN)   print "\n%s: %s" % (path, status)   cache_tick_count = GetTickCount()   return status      def add(path, state): - c = overlay_cache.setdefault(path, []) - c.append(state) + overlay_cache[path] = overlay_cache.get(path, '') + state