repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
diff.*.xfuncname which uses "extended" regex's for hunk header selection
2007-05-19
Simon Haus
m
ann
More cleanups a
n
d speedups
fo
r
labels
an
d
branche
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausmann
Cle
a
n
up
/
speed up the branch<> fi
l
e split a
n
d
remo
v
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-19
Simo
n
Ha
u
smann
More
w
ork o
n
th
e
increm
e
n
t
al im
p
ort
i
n
g
o
f
multiple
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
S
imon H
a
usmann
Give b
r
anches
a nice project p
r
ef
i
x
and don't bail
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
S
imon H
a
usmann
Star
t
ed rewr
i
ting
t
he branch
d
etectio
n
,
b
a
s
ed on "
p
4
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simo
n
Haus
m
an
n
Removed
unused cache
v
a
r
iable
s
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon
Hausmann
Fix branch setup after initial clone
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-17
Simon H
a
usmann
Remov
e
d todo it
e
m t
h
at is
i
m
p
leme
n
t
ed :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Added sup
p
ort
for
g
i
t
-p4 sync/rebase --wit
h
-origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Bit
e
th
e
bullet and a
u
tomatically
con
v
er
t
old s
t
yle
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Ha
u
smann
Changed the
d
e
f
ault p4 import branch to be refs/rem
o
tes
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon
Hausmann
Cr
e
a
te the origin based i
m
port branch usin
g
git update
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausma
n
n
R
e
m
o
ve
d
ancient and unused code to f
i
n
d
the last imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on Hausmann
Removed
cleantags comman
d
.
It doesn't ha
v
e any
meani
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hau
s
mann
Cle
a
n up
code du
p
l
i
cation for revision pa
r
s
ing and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon
H
ausmann
A
l
ways pass a sha1 for the initi
a
l parent
so t
h
at git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausma
n
n
Fixing syncing
(gitd
i
r d
i
scov
e
ry
/ cd) for bare
r
epositories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Sim
o
n Hau
s
mann
A lit
t
le to
d
o
note before I forget it :), based
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mo
n
Haus
m
ann
Fix calling git-p4 r
e
base from w
i
thin a s
u
bdirectory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
G
i
v
e a bet
t
er hint i
f
git-p4 submit fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon H
a
usmann
A
dded the possibility
of sk
i
pping patches during git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
S
imon
H
au
s
m
a
n
n
Make gi
t
-
p4 work with ba
r
e re
p
ositories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n Ha
u
smann
Fix git-p4 c
l
one
/
/depot/project (hea
d
import)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
C
o
nverted
to uni
x
newlin
e
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Make
submitting work
o
n
Windo
w
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Make sure all popen ca
l
ls use binary mode (for Win
d
o
ws
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Ad
d
ed a little
.
bat w
r
ap
p
er from Marius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
u
s
ma
n
n
Us
e
the subprocess module
inst
e
ad of po
p
en2 to
m
ake
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Hausmann
Docume
n
t
som
e
implementation det
a
ils, for the
c
urious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
imo
n
Ha
u
sman
n
Cleanu
p
, removed the
o
ld tagging code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
cleanup, ren
a
m
ed self
.
g
lobalPrefix to se
l
f
.
depotPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Micro
c
leanu
p
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Doc cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon H
a
us
m
an
n
Handle patch
e
rrors in git-p4 s
u
bmit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausman
n
A n
e
w
attempt at fix
i
ng the
c
hild-fast-
i
mport-proc
e
s
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
mo
n
H
a
usm
a
nn
Slightly improved formatting of the raw
_
i
n
put
q
u
estions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausma
n
n
Removed the old patch apply
code from g
i
t-p4
sub
m
it
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
Hausma
n
n
F
ix th
e
timezo
n
e fo
r
m
a
tting
.
N
o
w qgit also displays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Si
m
on Ha
u
smann
Print an err
o
r message of som
e
sort if gi
t
f
ast-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Si
m
on
Hausm
a
nn
Allow for convenient rebas
i
ng after
g
it-p4 submi
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n
H
ausman
n
Added a simple
example of usage to the "documentat
i
o
n" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
H
ausmann
fix variable u
s
age (oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon Hausm
a
nn
F
i
x
file
d
et
e
rmination for
#
head impor
t
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
Hau
s
man
n
A
dded
git-p4 cl
o
ne convenienc
e
com
m
an
d
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mon Hausma
n
n
Honor --
s
ilent for labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Ha
u
smann
T
urn off potentially
slow label detection by defau
l
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Haus
m
ann
Provide a tree sum
m
ary after git-p
4
rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
Ha
u
smann
Ad
d
ed git
-
p4
r
e
bas
e
co
n
venience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Clean
up python class n
a
mes
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Fix "compila
t
ion" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon H
a
usmann
F
i
x the docs for git-
p
4 submit and turn
g
it-p4 s
u
bmit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausmann
Fix varia
b
le usage
i
n tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Sim
o
n Hausm
a
nn
A
d
de
d
supp
o
rt f
o
r
m
a
pping p4 labels to gi
t
tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
S
i
mon Hau
s
mann
git-
p
4
d
eb
u
g
doesn't need a git repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Si
m
on Hausman
n
Do
n
't
try to parse any options
w
ith
g
it-p4
d
e
b
u
g
but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon H
a
usmann
Prefer git command ov
e
r git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
M
i
nor cosmetic fixlet for the git-p4 submit
sync quest
i
o
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hau
s
m
a
nn
Differ
e
nt v
e
rsions
of p4
have differen
t
o
utpu
t
f
o
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simo
n
H
a
usma
n
n
Use
the new incre
m
ent
a
l import
style by
d
e
f
ault
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hau
s
mann
Make
i
t possible to run git-p4 subm
i
t from within th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
S
i
m
o
n
H
a
usmann
Bra
n
d n
e
w s
m
a
r
t in
c
r
emental
i
mport t
h
a
t
doesn't
need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon
Hausmann
Set the defa
u
lt branch in run, not
i
n the constructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
on Hausmann
Helper f
u
nctio
n
t
o
che
c
k the existan
c
e of a
revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausm
a
nn
Add
e
d some h
e
lper
f
unc
t
ion(s) to parse the de
p
ot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Chan
g
ed the
defaul
t
br
a
nch for imports
from "maste
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausmann
Changed
the for
m
a
t of the importe
d
log message sligh
t
ly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hausmann
Re
m
oved t
h
e
.
py extension from git-
p
4 as
i
t's annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hau
s
mann
Don't show the submit temp
l
a
te a
n
d the diff fir
s
t in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
S
i
m
on Haus
m
ann
Make it possible to invo
k
e g
i
t-p4
f
rom within
s
ubdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Hausmann
M
a
de --appl
y
-as-
p
atch the default for git-
p
4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausman
n
Fix support for deleti
o
ns in git-p4 submit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausman
n
Added experim
e
ntal
b
u
t
s
u
p
e
r
-
fast --apply-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
ausmann
Docum
e
ntatio
n
enhancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
S
imon
H
ausmann
Sta
r
t
of the g
i
t
-p4 docu
m
enta
t
ion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
o
n
Hausman
n
Removed p4-fast-ex
p
ort and
p4-git-sync as they've
been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
H
a
u
smann
Fixed th
e
in
i
t
ial
v
e
rs
i
on
i
mport
b
y g
e
tti
n
g
the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon H
a
us
m
ann
Added missing "self"s to make th
e
s
c
rip
t
evaluate corr
e
ctly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Completely unteste
d
"merge" of p4-fast-export
.
py int
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausma
n
n
sync-to-p
e
rforce
is now ca
l
led submit
and fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
m
on Hausmann
P
a
rt of the code is
copyright
b
y Trolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
First (unt
e
sted
)
atte
m
pt at
m
igrati
n
g p4-git
-
sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Hausmann
Pro
v
ide a
l
ittle bit of help descri
p
ti
o
n fo
r
the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Start
moving t
h
e git-p4 tools
i
nto
one single script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
Hausman
n
Pass the right number of ar
g
um
e
nts to
commit, fixe
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
ausmann
Improv
e
d th
e
git
d
ir
d
etec
t
ion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simo
n
Hausmann
Defa
u
lt to inter
a
c
t
ive
syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simo
n
Hausmann
U
s
e p4 revert
.
.
.
instead of
revert -a
.
.
.
after submi
t
ting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausmann
Auto
-
detect the cu
r
rent git
branch bef
o
re submitt
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausma
n
n
I
g
n
o
re Apple
re
s
ource files when i
m
porting from perforc
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Haus
m
ann
Be
n
i
c
e
and
u
se /usr/bin/env pyth
o
n f
o
r th
e
git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simo
n
Hausmann
Automat
i
cally operate on a temporary
b
ranch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
Lo
t
s
of bugfixes to
p
4-g
i
t-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hau
s
mann
Fix git-dir op
t
ion and allow read
i
ng log
substi
t
utions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hausmann
Fir
s
t version of a new s
c
r
i
p
t to submit ch
a
nge
s
back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
Split up the cache commandline
o
p
tions into (co
m
mand
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Re
d
uce t
h
e n
u
mbe
r
of
f
alse "m
e
rges" by
skipping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More w
o
rk on branch detec
t
ion by imple
m
ent
i
ng changeIsBranc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Hausma
n
n
More code cl
e
anu
p
s and prepar
a
tions for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
Minor code clea
n
ups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Ha
u
smann
Make the p4 data/command cache configur
a
b
le through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next