repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Bite the bullet and automatically convert old style refs/heads/p4 repositories
2007-05-17
Simon Haus
m
ann
Bite the bullet
and
aut
o
mati
c
ally co
n
ve
r
t old style
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon Hausmann
C
ha
n
ge
d
th
e
def
a
ul
t
p4
i
mport b
r
anch
to be refs/remotes
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Sim
o
n Hausmann
Create th
e
or
i
gin
b
ased
i
m
p
ort branch us
i
n
g git up
d
ate
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon H
a
usmann
Re
m
oved a
n
cien
t
and
u
nused
code
to
find the last imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon Hau
s
m
a
nn
Removed cl
e
antags
c
ommand
.
It
d
oesn't have an
y
m
e
a
n
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
m
on Hausmann
Clean up code du
p
l
i
cation fo
r
rev
i
sion
p
ars
i
n
g
a
nd
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon Hau
s
m
a
nn
Al
w
ays
p
a
s
s a sha
1
fo
r
the init
i
al parent so that git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausman
n
Fixing
s
yncing (gitdir
d
isc
o
ver
y
/ cd) for bare repos
i
tories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simo
n
Hausmann
A
little to
d
o note be
f
or
e
I
f
orget it :
)
, based
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Sim
o
n Hausmann
Fix
calli
n
g git-
p
4 rebase from within a subdirectory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon
Hausma
n
n
Give a
b
ette
r
hint if git-p4 sub
m
it fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
imon
Hausmann
A
dded the possibility of
skipping patches durin
g
git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on Hausmann
Make gi
t
-p4
w
ork with bare
repositories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Fix git-p4 clone //de
p
ot/p
r
oject (head import)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Mariu
s
Storm-Olsen
Mak
e
t
he
c
o
mmand c
a
ll silen
t
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n
Hausman
n
Con
v
erted to
unix newlin
e
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on Hausmann
Make submitting work on Windows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Mak
e
s
u
re all popen
c
alls use binary mod
e
(for Windows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Ha
u
smann
Added a little
.
b
a
t wrapper from M
a
rius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon
Hausmann
Us
e
the subpro
c
ess module instead
o
f popen
2
t
o
make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
S
imon Ha
u
smann
D
oc
u
ment
s
ome implemen
t
a
ti
o
n details
,
for the
c
u
rious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon H
a
us
m
a
n
n
Cleanup, remo
v
ed t
h
e old tagging c
o
de
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Ha
u
sm
a
nn
c
l
eanu
p
, renamed self
.
g
l
o
b
alPre
f
ix
to self
.
depotPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Micro cle
a
nup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n Hausmann
Doc cl
e
anups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausman
n
Handle pat
c
h errors in git-p4 submit b
e
tter
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
A new atte
m
pt at f
i
xing the chil
d
-fast-import-
p
roce
s
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
Hausmann
Slightly improved formatting of the r
a
w_inp
u
t qu
e
stions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
Hausmann
R
emoved the old patc
h
a
p
ply cod
e
fro
m
git-p4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
imon Hausmann
Fix the timezone forma
t
ting
.
Now
q
gi
t
a
l
so dis
p
lay
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausmann
Print a
n
error message of
some sort i
f
git fast
-
i
m
port
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simo
n
Hausmann
Allow for c
o
nvenien
t
rebasing after
git-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Added a
simp
l
e ex
a
mple of
usage to the "documentation" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
fix variable usage (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon H
a
u
s
mann
Fix file determ
i
nati
o
n for #head imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
Hausma
n
n
A
d
d
e
d git-p4 c
l
on
e
convenien
c
e comman
d
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n H
a
usmann
Honor --s
i
lent for l
a
bel
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausma
n
n
Turn off potentially s
l
o
w
l
a
b
el
d
etect
i
on by
defau
l
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simo
n
Hausmann
Pr
o
vide a
t
r
ee summa
r
y
a
fter gi
t
-
p4 reb
a
se
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon H
a
usmann
Adde
d
git-p4 re
b
as
e
convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Clean up
p
ython
c
l
a
ss names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon
H
ausmann
Fix "compilation"
:)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausmann
Fix the docs fo
r
g
i
t
-
p4 submit and turn g
i
t-p4 subm
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
S
imon Hausmann
Fix v
a
ria
b
le
u
sage in
t
ag im
p
ort
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
S
i
mo
n
Hausmann
A
d
ded
suppor
t
fo
r
mapping p4 labels to
git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
S
i
m
o
n Hau
s
mann
g
i
t
-p4 debug doesn't
n
eed a git
r
eposito
r
y
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon H
a
u
smann
D
on't try
to par
s
e
an
y
o
ptions with git-p4
debug but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hausma
n
n
Pref
e
r git comman
d
over g
i
t-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Si
m
on Hau
s
ma
n
n
Minor cosmetic fixle
t
fo
r
t
he git-p4
su
b
mit sync qu
e
s
t
ion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
H
a
usmann
Different v
e
rsions of p4 have different out
p
ut for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Si
m
on Hausma
n
n
Use the
n
ew incr
e
m
ental import styl
e
by defa
u
lt
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
S
imon H
a
usma
n
n
Make it possible to run
git-p4
s
ubmit fr
o
m within the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
B
ran
d
new smart incremental
import that
doesn'
t
nee
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
on H
a
usmann
Set the
default branc
h
in run, n
o
t in the constru
c
tor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausmann
Helper f
u
nction t
o
check the existance of a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
a
u
smann
Add
e
d some h
e
l
pe
r
fu
n
ction
(
s
)
t
o parse the depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon H
a
usmann
Chang
e
d the default bran
c
h
f
or imports from "master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Changed t
h
e format of the imported l
o
g messag
e
slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Rem
o
ved
t
he
.
py extension from git
-
p4 as i
t
's annoyin
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n
H
ausm
a
nn
Don't show the su
b
mit template and
t
he diff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n
Haus
m
a
n
n
Make it possi
b
le to i
n
voke git-p4 from
within subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausman
n
Made --apply-as-pa
t
ch the defau
l
t for git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Fix
s
upport for del
e
tions i
n
git-p4 submit when
using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
a
n
n
A
d
d
ed exp
e
rimental but s
u
per-fast --apply
-
as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
Hausmann
Documenta
t
ion enhancem
e
nts
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on
Hausmann
Start
of the gi
t
-p4 documentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hau
s
mann
Removed p4-f
a
st-export and p4-git-sync as they've
been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Fixe
d
the ini
t
ia
l
version impor
t
by
getting the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausma
n
n
Added
missing
"
s
e
lf"s to make the
script evaluate correctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
im
o
n Hausmann
Completely untested "merge" of p4-fas
t
-export
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Hausmann
sync-to
-
p
erf
o
rce is n
o
w c
a
lle
d
su
b
m
i
t and fi
x
ed
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
au
s
ma
n
n
Part of th
e
cod
e
is copyright by Trollte
c
h
ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on Hausm
a
nn
First
(
u
nte
s
t
e
d)
a
ttempt at migrating p4-git-sync in
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausma
n
n
Provide a litt
l
e
bit of help descriptio
n
fo
r
t
he git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Start moving the git-p4
tools into one single script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Pass
the righ
t
number
of a
r
g
u
ments to co
m
mi
t
, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Ha
u
sma
n
n
Improved the
git dir detec
t
ion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simo
n
Haus
m
ann
Default to interactive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hausman
n
Use p4
r
evert
.
.
.
ins
t
ead
of rever
t
-a
.
.
.
after
s
ubmitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
imon Hausmann
Auto-detect th
e
current git branch befo
r
e submittin
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Ignor
e
Apple resourc
e
fi
l
es when i
m
porting from
p
erforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
i
m
on
Hausmann
Be nice
a
nd use /
u
sr/bin/env python for
t
he git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Haus
m
ann
Automatically
o
pe
r
at
e
on a temporary branch
,
n
e
ede
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
imon Haus
m
ann
Lots of bugfixe
s
to p4-gi
t
-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on Hausmann
Fix
g
i
t-dir op
t
ion a
n
d
allow reading log substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hausmann
First version
o
f a
n
ew
script to
s
ubmit
changes ba
c
k
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon H
a
usmann
S
p
lit up the ca
c
he commandline options i
n
t
o
(command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Reduce
t
h
e
numb
e
r of
false "merges" by skipping "bran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
nn
More work on branch d
e
tection by implementing c
h
angeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon
Hausmann
More
c
o
de cleanups and preparations for more
branc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Minor cod
e
cleanup
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausmann
Make the p4 data/comm
a
nd cache configurabl
e
through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Haus
m
a
nn
Fi
x
ed p4-d
e
bug file exten
s
ion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausm
a
n
n
Changed --
k
nown-branches
t
o take a
f
ile a
s
a
rg
u
m
e
nt
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Work in pro
g
ress on detecting
branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Haus
m
ann
Adjus
t
the output pa
r
sing
of git name-
r
ev to handl
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon
Hausm
a
n
n
Don't
print a plain newline at the e
n
d of the execut
i
on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
S
i
m
o
n
Hausmann
M
o
re w
o
rk in --silent
support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Added s
u
p
p
ort for --silent so that p4-fast-e
x
port can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon Hau
s
mann
Added p4 delet
e
behaviour
a
l emula
t
ion as t
o
do
i
tem
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next