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
More cleanups and speedups for labels and branches
2007-05-19
Simon H
a
u
s
mann
Mo
r
e cl
e
anups
a
n
d speedup
s
for labe
l
s and branches
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon H
a
usmann
Cleanup/speed
up
the b
r
a
n
ch<
>
file sp
l
it and r
e
moved
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon
H
ausma
n
n
More work on the incremental importing
o
f
mu
l
tiple
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
S
i
m
on
H
ausmann
Give b
r
anches a nice pr
o
ject pre
f
ix and don't bail
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
S
im
o
n Hausmann
Started rewriting the branch detection, based on "p4
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
R
e
m
oved unused cache variables
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon Haus
m
ann
Fix branc
h
se
t
u
p after initial clo
n
e
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-17
S
imon Hausman
n
Removed todo ite
m
tha
t
i
s implemented
:)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Added support for git-p4 sy
n
c/re
b
ase
-
-
with-o
r
igi
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausma
n
n
B
it
e
t
h
e bullet and a
u
tomatically convert
o
ld styl
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon
Ha
u
smann
Chan
g
ed
th
e
default p4 im
p
ort branch to
be
r
efs
/
remotes
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausman
n
Create the
o
rigin
b
ased import branch usi
n
g git upda
t
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausma
n
n
Removed
a
ncient and unused code
to find
the last imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon
H
ausmann
Removed c
l
e
a
nta
g
s comm
a
nd
.
It doesn't
h
av
e
any m
e
ani
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon Ha
u
s
m
ann
Clean up code duplicati
o
n
for re
v
ision parsing and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Alwa
y
s pass a
sha1 for the
initia
l
parent s
o
that git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausma
n
n
Fix
i
ng s
y
ncing (gitd
i
r discovery / cd
)
f
o
r
bare repositories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon
H
ausmann
A little todo note before
I
forge
t
it :
)
, bas
e
d
on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Si
m
on
Hausmann
Fix
calling git-p4 rebase
f
rom w
i
thin a subdirector
y
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Give
a
better hint if git-p4 submit f
a
ils
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Added
t
he possibility of s
k
ipping p
a
tche
s
during gi
t
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon
Hausmann
Make git-p4
wo
r
k wit
h
b
are repositories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Fix git-p4 clone //depot/proje
c
t (head import
)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Marius S
t
orm-Olsen
Make the
c
ommand call
si
l
ent
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausma
n
n
Conve
r
ted to unix newlines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on H
a
usman
n
Make submitti
n
g wo
r
k on
W
indows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
usmann
M
ake sure all
p
open calls use bi
n
ary mode (f
o
r
W
i
ndows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausm
a
nn
Added a little
.
b
a
t
w
r
apper from Mariu
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Use the
s
ubprocess module
i
nstea
d
of popen2 to ma
k
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Ha
u
smann
Document so
m
e i
m
plementat
i
on
d
e
tails, for
the curi
o
us
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
H
ausmann
C
l
eanu
p
, removed the old taggi
n
g
c
o
de
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
cleanup,
r
en
a
med self
.
globalPrefix to self
.
depotPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Micro
c
l
e
anup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n Hausmann
Doc clean
u
ps
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hau
s
m
a
n
n
Ha
n
dle pat
c
h errors in git-p4 submit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausman
n
A new attempt at fixing
the child-
f
a
s
t-import
-
p
r
oce
s
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
im
o
n Hausmann
Slightly im
p
roved formatting of t
h
e r
a
w_input
q
uestions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
m
on Ha
u
s
m
ann
R
e
mov
e
d the old
p
a
tch apply code
f
r
om git-p
4
submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Si
m
on Ha
u
smann
Fix the timezone formatting
.
Now qgit al
s
o disp
l
ays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausmann
Print a
n
error mess
a
ge of some sort if git fast-i
m
por
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hausman
n
A
l
low for conv
e
nien
t
rebasing
a
f
t
e
r git-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Add
e
d
a
simple e
x
a
mp
l
e of us
a
g
e
t
o the "docum
e
nt
a
tion"
:
)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon H
a
usm
a
nn
fix va
r
ia
b
l
e
usage
(
oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Fix fi
l
e determin
a
tion for #head i
m
ports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mon Hausma
n
n
Added git-p4 clon
e
co
n
venience comm
a
nd
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
Hausmann
Honor
-
-silent for labe
l
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Si
m
o
n Hausmann
Turn off
p
o
te
n
tially slow lab
e
l detecti
o
n by default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Haus
m
ann
P
rovide
a
t
ree summary aft
e
r
git-p4 r
e
ba
s
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
mon Hausma
n
n
Added g
i
t
-
p4 rebase convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Si
m
on Hausmann
C
lean up python cl
a
ss nam
e
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon
H
ausm
a
nn
Fix
"
compilat
i
on" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausmann
Fix the docs
for
g
it
-
p4 submi
t
and
turn git-p4 sub
m
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausmann
Fix variable usage i
n
tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hau
s
mann
Added
s
upp
o
r
t for m
a
pping p4 labels
t
o git t
a
gs
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Si
m
on Hausmann
git
-
p
4
debug
doesn't
nee
d
a
git repo
s
itory
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausmann
Don't try to parse any
options w
i
th git-p4 debug
b
ut
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon
Haus
m
ann
Prefer git
c
o
mmand over
g
it-comman
d
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hau
s
m
ann
Minor cosmetic fixlet for
t
he
g
it-p4
s
ubmi
t
sync quest
i
on
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hau
s
mann
Different
v
ersions
o
f
p4
h
a
ve
d
i
f
f
erent output fo
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon H
a
u
s
mann
Use
the new incremental imp
o
rt style by default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Make
i
t p
o
ssible to run git-p4 sub
m
it fr
o
m within
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
Brand new smart increme
n
tal imp
o
rt
t
hat doesn't n
e
ed
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
H
a
usmann
Se
t
the default branch in run, not
in the const
r
uctor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
m
on Hau
s
mann
Hel
p
er function to check the exist
a
nce of a revisi
o
n
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hau
s
ma
n
n
Added som
e
helper function(s)
to par
s
e the depot
p
ath
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hau
s
mann
Changed
t
h
e
default b
r
anch for i
m
ports from "maste
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausmann
Chang
e
d t
h
e format of t
h
e impor
t
ed
l
o
g messa
g
e slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausm
a
nn
Remo
v
e
d the
.
py extension
f
rom git-p4 as it's
a
nnoyi
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
a
u
s
mann
D
on't show the submi
t
template and
t
h
e dif
f
first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on
Hausmann
Make it
poss
i
bl
e
to invoke git-p4 f
r
om with
i
n subdi
r
ectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Made --apply-a
s
-
patc
h
the default
for git-p
4
submi
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Ha
u
smann
Fix support for
de
l
etions in git-p4 submit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausmann
Adde
d
experi
m
e
n
tal but super-fast
-
-app
l
y
-as-
p
atch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Documentation en
h
ancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausman
n
Sta
r
t of the git-p4 doc
u
mentat
i
on
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
m
on Ha
u
smann
R
e
m
oved p4-fast-export
and p4-git
-
sync a
s
they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mon Ha
u
smann
Fixed the initial
version
i
mport by getting the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Add
e
d missin
g
"
s
elf"s to make th
e
scrip
t
evaluat
e
c
o
rrectly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Co
m
pletely untested "merg
e
"
of p
4
-fa
s
t
-
expo
r
t
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
sync-to-p
e
rfor
c
e is now c
a
lled sub
m
i
t and fix
e
d
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon Hausmann
P
a
rt o
f
the code is copyright by
T
rolltech
A
S
A
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hau
s
mann
F
i
r
s
t
(
untested) attemp
t
at migrating
p
4-git-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Haus
m
ann
Provide a lit
t
le
b
i
t
of help description for the
g
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mo
n
Hausmann
Start moving the git-p4 tools into on
e
si
n
gle scrip
t
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n
Hausm
a
nn
Pass the right nu
m
ber of arguments to
c
o
mmit, fix
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Impr
o
v
e
d
the git
dir dete
c
t
i
o
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon
Hausmann
Default
t
o in
t
eractive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hausmann
Use p4 revert
.
.
.
i
n
stead of rev
e
rt -a
.
.
.
a
f
t
e
r submitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
A
u
to-detec
t
the current git branch
b
efo
r
e su
b
mit
t
ing
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
imon Hausmann
Ignore A
p
p
l
e resourc
e
fi
l
es when importing f
r
om perf
o
rce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon H
a
usmann
Be nice and u
s
e
/us
r
/b
i
n/env python
for the gi
t
-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Automatica
l
ly
o
pe
r
ate on a temp
o
rar
y
br
a
nch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
L
o
ts of b
u
gfix
e
s to p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
F
ix git-dir option and allo
w
reading
log substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hausmann
Fi
r
st vers
i
on o
f
a new
sc
r
ipt
to submit changes
b
ack
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
m
o
n Hausm
a
nn
Split up t
h
e cache commandline optio
n
s into (command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
o
n
Hausman
n
Reduce
the numb
e
r of
f
als
e
"merges" by
skipping "b
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More
w
ork on branch detection by
i
mplem
e
ntin
g
changeIs
B
ranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
m
o
n
Hausma
n
n
More code cleanups
and preparat
i
ons
f
o
r
m
ore branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Hausmann
Min
o
r c
o
de cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next