Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

status, chunkselect: use qtlib.difflabel()

Changeset a1b7341bf40d…

Parent 582af01c0493…

by Steve Borho

Changes to 2 files · Browse files at a1b7341bf40d Showing diff from parent 582af01c0493 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​chunkselect.py Stacked
 
87
88
89
90
 
91
92
93
 
87
88
89
 
90
91
92
93
@@ -87,7 +87,7 @@
  ui.pushbuffer()   chunk.write(ui)   data = ui.popbuffer() - for a, l in patch.difflabel(data.splitlines, True): + for a, l in qtlib.difflabel(data.splitlines, True):   hu.write(a, label=l)   o, e = hu.getdata()   items.append(o)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
378
379
380
381
 
382
383
384
 
398
399
400
401
 
402
403
404
 
378
379
380
 
381
382
383
384
 
398
399
400
 
401
402
403
404
@@ -378,7 +378,7 @@
  # Generate diffs to first parent   m = cmdutil.matchfiles(self.repo, [wfile])   try: - for s, l in patch.difflabel(self.wctx.diff, match=m, git=True): + for s, l in qtlib.difflabel(self.wctx.diff, match=m, git=True):   hu.write(s, label=l)   except (IOError, error.RepoError, error.LookupError, util.Abort), e:   err = hglib.tounicode(str(e)) @@ -398,7 +398,7 @@
    # Generate diffs to second parent   try: - for s, l in patch.difflabel(self.wctx.diff, self.wctx.p2(), + for s, l in qtlib.difflabel(self.wctx.diff, self.wctx.p2(),   match=m, git=True):   hu.write(s, label=l)   except (IOError, error.RepoError, error.LookupError, util.Abort), e: