We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 13 files · Browse files at b3dcc064467a Showing diff from parent cc9cdcbb584d e3c4d9604e4a Diff from another changeset...
-
MANIFEST.in
-
icons/scalable/actions/edit-file.svg
-
setup.py
-
tortoisehg/hgqt/chunks.py
-
tortoisehg/hgqt/compress.py
-
tortoisehg/hgqt/csinfo.py
-
tortoisehg/hgqt/filedialogs.py
-
tortoisehg/hgqt/pbranch.py
-
tortoisehg/hgqt/settings.py
-
tortoisehg/hgqt/status.py
-
tortoisehg/hgqt/thgrepo.py
-
tortoisehg/util/hglib.py
-
tortoisehg/util/version.py
|
@@ -4,6 +4,7 @@ include contrib/mergetools.rc
include contrib/tortoisehg.desktop
include COPYING.txt
-recursive-include i18n *.po
+include tortoisehg/hgqt/*.ui
+recursive-include i18n *.po *.py
recursive-include doc *
recursive-exclude doc/build *
|
||
|
|
|
@@ -10,63 +10,19 @@ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
+ width="48"
+ height="48"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.48.0 r9654"
version="1.0"
- sodipodi:docname="edit.svg"
+ sodipodi:docname="edit-file.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <title
+ id="title3119">Edit File</title>
<defs
id="defs4">
<linearGradient
- id="linearGradient3687">
- <stop
- style="stop-color:#94ec3e;stop-opacity:1;"
- offset="0"
- id="stop3689" />
- <stop
- style="stop-color:#67bd13;stop-opacity:1;"
- offset="1"
- id="stop3691" />
- </linearGradient>
- <linearGradient
- id="linearGradient3679">
- <stop
- style="stop-color:#4e9a06;stop-opacity:1;"
- offset="0"
- id="stop3681" />
- <stop
- style="stop-color:#4e9a06;stop-opacity:0;"
- offset="1"
- id="stop3683" />
- </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective10" />
- <inkscape:perspective
- id="perspective2892"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5209"
- id="linearGradient2456"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.5555556,0,0,0.625,47.976189,108.12111)"
- x1="11.5"
- y1="13"
- x2="11.5"
- y2="20" />
- <linearGradient
inkscape:collect="always"
id="linearGradient5209">
<stop
@@ -78,6 +34,127 @@ offset="1"
id="stop5213" />
</linearGradient>
+ <linearGradient
+ id="linearGradient2865">
+ <stop
+ id="stop2867"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2869"
+ style="stop-color:#000000;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2966">
+ <stop
+ id="stop2968"
+ style="stop-color:#ffd1d1;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3006"
+ style="stop-color:#ff1d1d;stop-opacity:1"
+ offset="0.5" />
+ <stop
+ id="stop2970"
+ style="stop-color:#6f0000;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2974">
+ <stop
+ id="stop2976"
+ style="stop-color:#c1c1c1;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2978"
+ style="stop-color:#acacac;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2984">
+ <stop
+ id="stop2986"
+ style="stop-color:#e7e2b8;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2988"
+ style="stop-color:#e7e2b8;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2994">
+ <stop
+ id="stop2996"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2998"
+ style="stop-color:#c9c9c9;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5209"
+ id="linearGradient3092"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.5555556,0,0,0.625,47.976189,108.12111)"
+ x1="11.5"
+ y1="13"
+ x2="11.5"
+ y2="20" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2865"
+ id="radialGradient3094"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7566789,0,0,0.10223614,12.177896,36.865828)"
+ cx="20.525417"
+ cy="40.437481"
+ fx="20.525417"
+ fy="40.437481"
+ r="19.5625" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2966"
+ id="linearGradient3096"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-5.669292,0)"
+ x1="48.90625"
+ y1="17.376184"
+ x2="50.988335"
+ y2="22.250591" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2974"
+ id="linearGradient3098"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-5.669292,0)"
+ x1="46"
+ y1="19.8125"
+ x2="47.6875"
+ y2="22.625" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2984"
+ id="radialGradient3100"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.923565,0,0,2.029717,-61.55532,-27.88417)"
+ cx="29.053354"
+ cy="27.640751"
+ fx="29.053354"
+ fy="27.640751"
+ r="3.2408545" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2994"
+ id="linearGradient3102"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-5.825542,0.125)"
+ x1="25.71875"
+ y1="31.046875"
+ x2="25.514589"
+ y2="30.703125" />
</defs>
<sodipodi:namedview
id="base"
@@ -89,18 +166,18 @@ objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="15.999999"
- inkscape:cx="15.307124"
- inkscape:cy="17.470426"
+ inkscape:zoom="4"
+ inkscape:cx="17.434564"
+ inkscape:cy="57.076789"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:snap-bbox="true"
inkscape:snap-nodes="false"
- inkscape:window-width="1055"
- inkscape:window-height="774"
- inkscape:window-x="162"
- inkscape:window-y="22"
+ inkscape:window-width="1162"
+ inkscape:window-height="690"
+ inkscape:window-x="55"
+ inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:snap-global="false">
<inkscape:grid
@@ -108,8 +185,10 @@ id="grid2898"
visible="true"
enabled="true"
- empspacing="4"
- dotted="true" />
+ empspacing="2"
+ dotted="false"
+ snapvisiblegridlinesonly="true"
+ originx="0px" />
</sodipodi:namedview>
<metadata
id="metadata7">
@@ -119,27 +198,50 @@ <dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title>Sync</dc:title>
- <dc:date>2008-04-09</dc:date>
+ <dc:title>Edit File</dc:title>
+ <dc:date>2011-03-03</dc:date>
<dc:creator>
<cc:Agent>
<dc:title>Peer Sommerlund</dc:title>
</cc:Agent>
</dc:creator>
- <dc:description>Sync icon for TortoiseHg</dc:description>
+ <dc:description>Edit file icon for TortoiseHg</dc:description>
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Angel Ezquerra, Garrett LeSage, Jakub Steiner, Steven Garrity
+</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Vector"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(-49.142857,-92.933609)"
+ transform="translate(-49.142857,-76.933609)"
style="display:inline">
<g
style="display:inline"
- transform="matrix(2.1889772,0,0,2.1699916,-57.313434,-150.80748)"
- id="g2448">
+ transform="matrix(3.2443926,0,0,3.2112338,-109.10351,-282.99259)"
+ id="paper">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc"
@@ -152,7 +254,7 @@ height="5"
width="5.0000005"
id="rect2452"
- style="fill:url(#linearGradient2456);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient3092);fill-opacity:1;stroke:none" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc"
@@ -161,72 +263,59 @@ style="fill:#d3d7cf;fill-opacity:1;stroke:#204a87;stroke-width:0.52666515;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
</g>
<g
- id="g3875"
- transform="matrix(0.77922702,-0.76808173,0.68839409,0.86942937,-50.469473,71.694196)">
- <rect
- ry="0.46162814"
- y="96.212311"
- x="75.624687"
- height="3.8019743"
- width="3.2394695"
- id="rect3823"
- style="fill:#ff0007;fill-opacity:1;stroke:#ff0007;stroke-width:0.55740553;stroke-opacity:1" />
- <rect
- ry="0.27079925"
- y="97.86422"
- x="75.888199"
- height="2.2303057"
- width="3.024955"
- id="rect3823-1"
- style="fill:#c80a0f;fill-opacity:1;stroke:#c80a0f;stroke-width:0.41254506;stroke-opacity:1;display:inline" />
- <rect
- ry="0.44772893"
- y="96.433609"
- x="57.642857"
- height="3.3750002"
- width="19.0625"
- id="rect3809"
- style="fill:#fdff8e;fill-opacity:1;stroke:#fbef69;stroke-opacity:1" />
- <rect
- ry="0.40559486"
- y="98.128265"
- x="57.868763"
- height="1.6419326"
- width="18.876308"
- id="rect3811"
- style="fill:#fce58b;fill-opacity:1;stroke:#fbef69;stroke-width:0.95181751;stroke-opacity:1" />
+ transform="matrix(1.1060221,0,0,1.1060221,45.14058,64.504423)"
+ id="pencil-with-shadow">
<path
- transform="matrix(-0.50469569,-0.1346752,0.1142493,-0.43709081,60.151316,99.50144)"
- d="M 5.6875003,5.8749986 C 5.1191712,5.6931332 3.4363419,-2.0540349 3.8780065,-2.4552897 4.3196711,-2.8565445 11.87033,-0.44033338 11.996995,0.1427868 12.123659,0.72590698 6.2558295,6.0568639 5.6875003,5.8749986 z"
- inkscape:randomized="0"
- inkscape:rounded="0.07"
- inkscape:flatsided="true"
- sodipodi:arg2="2.9276969"
- sodipodi:arg1="1.8804993"
- sodipodi:r2="3.4801335"
- sodipodi:r1="4.9216518"
- sodipodi:cy="1.1874986"
- sodipodi:cx="7.1875005"
- sodipodi:sides="3"
- id="path3821"
- style="fill:#ffc79e;fill-opacity:1;stroke:#ef8666;stroke-opacity:1"
- sodipodi:type="star" />
- <path
- transform="matrix(-0.14549318,-0.05160851,0.03293568,-0.16749635,55.690452,98.405597)"
- d="M 5.6875003,5.8749986 C 5.1191712,5.6931332 3.4363419,-2.0540349 3.8780065,-2.4552897 4.3196711,-2.8565445 11.87033,-0.44033338 11.996995,0.1427868 12.123659,0.72590698 6.2558295,6.0568639 5.6875003,5.8749986 z"
- inkscape:randomized="0"
- inkscape:rounded="0.07"
- inkscape:flatsided="true"
- sodipodi:arg2="2.9276969"
- sodipodi:arg1="1.8804993"
- sodipodi:r2="3.4801335"
- sodipodi:r1="4.9216518"
- sodipodi:cy="1.1874986"
- sodipodi:cx="7.1875005"
- sodipodi:sides="3"
- id="path3821-0"
- style="fill:#ef8666;fill-opacity:1;stroke:#ef8666;stroke-opacity:1;display:inline"
- sodipodi:type="star" />
+ d="m 44.809674,41 a 14.802531,1.9999933 0 0 1 -29.605062,0 14.802531,1.9999933 0 1 1 29.605062,0 z"
+ id="pencil-shadow"
+ style="opacity:0.2;fill:url(#radialGradient3094)"
+ inkscape:connector-curvature="0" />
+ <g
+ transform="matrix(1.033699,-0.276979,0.276979,1.033699,16.06828,-14.54823)"
+ id="pencil">
+ <path
+ d="m 17.34116,32.5 5.625,-5.625 20.093749,-9.75 c 3.25,-1.25 5.1875,3.375 2.3125,5 L 25.34116,31.5 l -8,1 z"
+ transform="translate(-29.75546,19)"
+ id="path2960"
+ style="fill:#cb9022;fill-opacity:1;fill-rule:evenodd;stroke:#5c410c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 38.330708,20 c 0,0 1.4375,0.09375 2,1.34375 0.579493,1.287761 0,2.65625 0,2.65625 l 5.03125,-2.46875 c 0,0 1.452032,-0.881367 0.65625,-2.84375 -0.784912,-1.935577 -2.6875,-1.15625 -2.6875,-1.15625 l -5,2.46875 z"
+ transform="translate(-29.75546,19)"
+ id="path2964"
+ style="fill:url(#linearGradient3096)"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 38.330708,20 c 0,0 1.4375,0.09375 2,1.34375 0.579493,1.287761 0,2.65625 0,2.65625 l 2,-1 c 0,0 0.827032,-1.318867 0.21875,-2.6875 C 41.924458,18.90625 40.330708,19 40.330708,19 l -2,1 z"
+ transform="translate(-29.75546,19)"
+ id="path2962"
+ style="fill:url(#linearGradient3098)"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 18.768208,31.78125 4.5,-4.5 c 1.5,0.8125 2.28125,2.15625 1.875,3.71875 l -6.375,0.78125 z"
+ transform="translate(-29.75546,19)"
+ id="path2982"
+ style="fill:url(#radialGradient3100)"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 20.111958,30.375 -1.625,1.59375 2.34375,-0.3125 c 0.21875,-0.71875 -0.1875,-1.0625 -0.71875,-1.28125 z"
+ transform="translate(-29.75546,19)"
+ id="path2992"
+ style="fill:url(#linearGradient3102)"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 23.268208,27.25 1.5625,1.25 15.38734,-7.31867 C 39.773616,20.325286 38.976281,20.096733 38.314669,20.019068 L 23.268208,27.25 z"
+ transform="translate(-29.75546,19)"
+ id="path3002"
+ style="fill:#ffffff;fill-opacity:0.36363639"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 25.143208,31.0625 0.1875,-0.75 15.23109,-7.1296 c 0,0 -0.11016,0.613627 -0.215879,0.74935 L 25.143208,31.0625 z"
+ transform="translate(-29.75546,19)"
+ id="path3004"
+ style="fill:#000000;fill-opacity:0.36363639"
+ inkscape:connector-curvature="0" />
+ </g>
</g>
</g>
</svg>
|
|
@@ -220,7 +220,7 @@ cls._wrappeduic = True
class clean_local(Command):
- pats = ['*.py[co]', '*_ui.py', '*_rc.py', '*.orig', '*.rej']
+ pats = ['*.py[co]', '*_ui.py', '*_rc.py', '*.mo', '*.orig', '*.rej']
excludedirs = ['.hg', 'build', 'dist']
description = 'clean up generated files (%s)' % ', '.join(pats)
user_options = []
|
||
|
@@ -340,6 +340,8 @@ path = self.repo.wjoin(file)
if os.path.exists(path):
self.mtime = os.path.getmtime(path)
+ else:
+ self.mtime = None
self.diffbrowse.displayFile(file, status)
self.fileSelected.emit(True)
else:
|
||
|
@@ -50,7 +50,7 @@ self.destcsinfo = dest
self.layout().addWidget(destb)
- self.cmd = cmdui.Widget(True, False, self)
+ self.cmd = cmdui.Widget(True, True, self)
self.cmd.commandFinished.connect(self.commandFinished)
self.cmd.setShowOutput(True)
self.showMessage.connect(self.cmd.stbar.showMessage)
|
||
|
@@ -138,9 +138,9 @@ return None
return hglib.tounicode(value)[:80]
elif item == 'user':
- return hglib.tounicode(ctx.user())
+ return hglib.tounicode(hglib.user(ctx))
elif item == 'shortuser':
- return hglib.tounicode(hglib.username(ctx.user()))
+ return hglib.tounicode(hglib.username(hglib.user(ctx)))
elif item == 'dateage':
date = self.get_data('date', *args)
age = self.get_data('age', *args)
|
||
|
@@ -400,7 +400,8 @@ side = 'left'
path = self.filerevmodel.graph.nodesdict[rev].extra[0]
fc = self.repo.changectx(rev).filectx(path)
- self.filedata[side] = fc.data().splitlines()
+ data = hglib.tounicode(fc.data())
+ self.filedata[side] = data.splitlines()
self.update_diff(keeppos=otherside[side])
def goto(self, rev):
@@ -523,7 +524,7 @@ self._diffmatch = {'left': [x[1:3] for x in blocks],
'right': [x[3:5] for x in blocks]}
for side in sides:
- self.viewers[side].setText('\n'.join(self.filedata[side]))
+ self.viewers[side].setText(u'\n'.join(self.filedata[side]))
self.update_page_steps(keeppos)
self.timer.start()
|
||
|
@@ -55,7 +55,7 @@ tb.setFloatable(False)
self.actionPMerge = a = QWidgetAction(self)
- a.setIcon(geticon("merge"))
+ a.setIcon(geticon("hg-merge"))
a.setToolTip(_('Merge all pending dependencies'))
tb.addAction(self.actionPMerge)
self.actionPMerge.triggered.connect(self.pmerge_clicked)
@@ -79,7 +79,7 @@ self.actionPNew.triggered.connect(self.pnew_clicked)
self.actionEditPGraph = a = QWidgetAction(self)
- a.setIcon(geticon("log")) #STOCK_EDIT
+ a.setIcon(geticon("edit-file")) #STOCK_EDIT
a.setToolTip(_('Edit patch dependency graph'))
tb.addAction(self.actionEditPGraph)
self.actionEditPGraph.triggered.connect(self.edit_pgraph_clicked)
|
||
|
@@ -587,7 +587,13 @@ self.restoreGeometry(s.value('settings/geom').toByteArray())
def username():
- return util.username() or os.environ.get('USERNAME') or _('User')
+ name = util.username()
+ if name:
+ return hglib.tounicode(name)
+ name = os.environ.get('USERNAME')
+ if name:
+ return hglib.tounicode(name)
+ return _('User')
self.conftabs = QTabWidget()
layout.addWidget(self.conftabs)
|
||
|
@@ -617,14 +617,29 @@ """Helper function used to sort items according to their hg status
Statuses are ranked in the following order:
- 'S','M','A','R','!','?','C','I'
+ 'S','M','A','R','!','?','C','I',''
"""
- sortList = ['S','M','A','R','!','?','C','I']
+ sortList = ['S','M','A','R','!','?','C','I','']
try:
rank = sortList.index(value)
- except IndexError, e:
- rank = len(shortList)
+ except (IndexError, ValueError):
+ rank = len(shortList) # Set the lowest rank by default
+
+ return rank
+
+ def getMergeStatusRank(value):
+ """Helper function used to sort according to item merge status
+
+ Merge statuses are ranked in the following order:
+ 'S','U','R',''
+ """
+ sortList = ['S','U','R','']
+
+ try:
+ rank = sortList.index(value)
+ except (IndexError, ValueError):
+ rank = len(shortList) # Set the lowest rank by default
return rank
@@ -657,6 +672,8 @@ self.rows.sort(lambda x, y: cmp(c[x[col]], c[y[col]]))
elif col == COL_STATUS:
self.rows.sort(key=lambda x: getStatusRank(x[col]))
+ elif col == COL_MERGE_STATE:
+ self.rows.sort(key=lambda x: getMergeStatusRank(x[col]))
else:
self.rows.sort(lambda x, y: cmp(x[col], y[col]))
|
||
|
@@ -212,6 +212,10 @@ _uiprops = '''_uifiles _uimtime _shell postpull tabwidth maxdiff
deadbranches _exts _thghiddentags displayname summarylen
shortname mergetools namedbranches'''.split()
+
+# _bookmarkcurrent is a Mercurial property, we include it here to work
+# around a bug in hg-1.8. It should be removed when we drop support for
+# Mercurial 1.8
_thgrepoprops = '''_thgmqpatchnames thgmqunappliedpatches
_branchheads _bookmarkcurrent'''.split()
|
||
|
@@ -23,7 +23,7 @@ demandimport.enable()
from mercurial import ui, util, extensions, match, bundlerepo, url, cmdutil
-from mercurial import dispatch, encoding, templatefilters, filemerge
+from mercurial import dispatch, encoding, templatefilters, filemerge, error
_encoding = encoding.encoding
_encodingmode = encoding.encodingmode
@@ -520,6 +520,22 @@ author = util.shortuser(user)
return author
+def user(ctx):
+ '''
+ Get the username of the change context. Does not abort and just returns
+ an empty string if ctx is a working context and no username has been set
+ in mercurial's config.
+ '''
+ try:
+ user = ctx.user()
+ except error.Abort:
+ if ctx._rev is not None:
+ raise
+ # ctx is a working context and probably no username has
+ # been configured in mercurial's config
+ user = ''
+ return user
+
def get_revision_desc(fctx, curpath=None):
"""return the revision description as a string"""
author = tounicode(username(fctx.user()))
|
||
|
@@ -20,7 +20,7 @@ repo = hg.repository(u, path=thgpath)
u.pushbuffer()
- commands.identify(u, repo, id=True, tags=True)
+ commands.identify(u, repo, id=True, tags=True, rev='.')
l = u.popbuffer().split()
while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags
l.pop()
|
||
Add a tag
Loading...