|
@@ -88,7 +88,7 @@ def cmd_fetch(args):
|
|
|
determine_wants = r.object_store.determine_wants_all
|
|
|
refs = client.fetch(path, r, progress=sys.stdout.write)
|
|
|
print("Remote refs:")
|
|
|
- for item in refs.iteritems():
|
|
|
+ for item in refs.items():
|
|
|
print("%s -> %s" % item)
|
|
|
|
|
|
|
|
@@ -132,9 +132,9 @@ def cmd_dump_pack(args):
|
|
|
for name in x:
|
|
|
try:
|
|
|
print("\t%s" % x[name])
|
|
|
- except KeyError, k:
|
|
|
+ except KeyError as k:
|
|
|
print("\t%s: Unable to resolve base %s" % (name, k))
|
|
|
- except ApplyDeltaError, e:
|
|
|
+ except ApplyDeltaError as e:
|
|
|
print("\t%s: Unable to apply delta: %r" % (name, e))
|
|
|
|
|
|
|
|
@@ -234,7 +234,7 @@ def cmd_rev_list(args):
|
|
|
def cmd_tag(args):
|
|
|
opts, args = getopt(args, '', [])
|
|
|
if len(args) < 2:
|
|
|
- print 'Usage: dulwich tag NAME'
|
|
|
+ print('Usage: dulwich tag NAME')
|
|
|
sys.exit(1)
|
|
|
porcelain.tag('.', args[0])
|
|
|
|
|
@@ -325,14 +325,15 @@ def cmd_status(args):
|
|
|
status = porcelain.status(gitdir)
|
|
|
if status.staged:
|
|
|
sys.stdout.write("Changes to be committed:\n\n")
|
|
|
- for kind, names in status.staged.iteritems():
|
|
|
+ for kind, names in status.staged.items():
|
|
|
for name in names:
|
|
|
sys.stdout.write("\t%s: %s\n" % (kind, name))
|
|
|
sys.stdout.write("\n")
|
|
|
if status.unstaged:
|
|
|
sys.stdout.write("Changes not staged for commit:\n\n")
|
|
|
for name in status.unstaged:
|
|
|
- sys.stdout.write("\t%s\n" % name)
|
|
|
+ sys.stdout.write("\t%s\n" %
|
|
|
+ name.decode(sys.getfilesystemencoding()))
|
|
|
sys.stdout.write("\n")
|
|
|
if status.untracked:
|
|
|
sys.stdout.write("Untracked files:\n\n")
|