diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-31 17:04:44 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-31 17:04:44 +0100 |
commit | 013cc5ea30f13c2ea3be8851a34efe7fd6af2eae (patch) | |
tree | 19418a4b57e5c39efb717bf83c94593cde71fb8c /dgit | |
parent | c1e9b51c128cde4b5359618c28405981d690127e (diff) |
Push replay prevention protocol: Rename "supersedes" to "previously", as not necessarily actually superseded
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -52,7 +52,7 @@ our $new_package = 0; our $ignoredirty = 0; our $rmonerror = 1; our @deliberatelies; -our %supersedes; +our %previously; our $existing_package = 'dpkg'; our $cleanmode = 'dpkg-source'; our $changes_since_version; @@ -1542,9 +1542,9 @@ tagger $authline $package release $cversion for $clogsuite ($csuite) [dgit] [dgit distro=$declaredistro$delibs] END - foreach my $ref (sort keys %supersedes) { + foreach my $ref (sort keys %previously) { print TO <<END or die $!; -[dgit supersede:$ref=$supersedes{$ref}] +[dgit previously:$ref=$previously{$ref}] END } @@ -1665,8 +1665,8 @@ sub dopush ($) { git_for_each_ref(lrfetchrefs, sub { my ($objid,$objtype,$lrfetchrefname,$reftail) = @_; my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1); - responder_send_command("supersedes $rrefname=$objid"); - $supersedes{$rrefname} = $objid; + responder_send_command("previously $rrefname=$objid"); + $previously{$rrefname} = $objid; }); } @@ -1984,12 +1984,12 @@ sub i_resp_param ($) { $i_param{$1} = $2; } -sub i_resp_supersedes ($) { +sub i_resp_previously ($) { $_[0] =~ m#^(refs/tags/\S+)=(\w+)$# - or badproto \*RO, "bad supersedes spec"; + or badproto \*RO, "bad previously spec"; my $r = system qw(git check-ref-format), $1; - die "bad supersedes ref spec ($r)" if $r; - $supersedes{$1} = $2; + die "bad previously ref spec ($r)" if $r; + $previously{$1} = $2; } our %i_wanted; |