equal
deleted
inserted
replaced
143 '{latesttag}+{latesttagdistance}-'] |
143 '{latesttag}+{latesttagdistance}-'] |
144 version = runcmd(cmd, env) + l[0] |
144 version = runcmd(cmd, env) + l[0] |
145 if version.endswith('+'): |
145 if version.endswith('+'): |
146 version += time.strftime('%Y%m%d') |
146 version += time.strftime('%Y%m%d') |
147 elif os.path.exists('.hg_archival.txt'): |
147 elif os.path.exists('.hg_archival.txt'): |
148 kw = dict([t.strip() for t in l.split(':', 1)] |
148 kw = dict([[t.strip() for t in l.split(':', 1)] |
149 for l in open('.hg_archival.txt')) |
149 for l in open('.hg_archival.txt')]) |
150 if 'tag' in kw: |
150 if 'tag' in kw: |
151 version = kw['tag'] |
151 version = kw['tag'] |
152 elif 'latesttag' in kw: |
152 elif 'latesttag' in kw: |
153 version = '%(latesttag)s+%(latesttagdistance)s-%(node).12s' % kw |
153 version = '%(latesttag)s+%(latesttagdistance)s-%(node).12s' % kw |
154 else: |
154 else: |