Show More
@@ -237,15 +237,15 def updatefromremote(ui, repo, remote, p | |||
|
237 | 237 | if changed: |
|
238 | 238 | write(repo) |
|
239 | 239 | |
|
240 |
def diff(ui, |
|
|
240 | def diff(ui, dst, src): | |
|
241 | 241 | ui.status(_("searching for changed bookmarks\n")) |
|
242 | 242 | |
|
243 |
|
|
|
244 |
|
|
|
243 | smarks = src.listkeys('bookmarks') | |
|
244 | dmarks = dst.listkeys('bookmarks') | |
|
245 | 245 | |
|
246 |
diff = sorted(set( |
|
|
246 | diff = sorted(set(smarks) - set(dmarks)) | |
|
247 | 247 | for k in diff: |
|
248 |
mark = ui.debugflag and |
|
|
248 | mark = ui.debugflag and smarks[k] or smarks[k][:12] | |
|
249 | 249 | ui.write(" %-25s %s\n" % (k, mark)) |
|
250 | 250 | |
|
251 | 251 | if len(diff) <= 0: |
General Comments 0
You need to be logged in to leave comments.
Login now